yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V16 RC: Add more debug info to System Information (#19343)

Browse Source 
* feat: rearrange sysinfo and see if we can pull in the version from package.json directly

* fix: use correct id to select #codeblock
This commit is contained in:
Jacob Overgaard
2025-05-19 11:17:46 +02:00
committed by GitHub
parent 343bb853fd
commit 2c3af1b329
4 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/config/config.repository.ts
View File

@@ -35,13 +35,18 @@ export class UmbTemporaryFileConfigRepository extends UmbRepositoryBase implemen
return;
}
const { data } = await this.#dataSource.getConfig();
const temporaryFileConfig = await this.requestTemporaryFileConfiguration();
if (data) {
this.#dataStore?.update(data);
if (temporaryFileConfig) {
this.#dataStore?.update(temporaryFileConfig);
}
}
async requestTemporaryFileConfiguration() {
const { data } = await this.#dataSource.getConfig();
return data;
}
/**
* Subscribe to the entire configuration.
*/

2
src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/config/config.server.data-source.ts
View File

@@ -13,6 +13,6 @@ export class UmbTemporaryFileConfigServerDataSource {
* Get the temporary file configuration.
*/
getConfig() {
return tryExecute(this.#host, TemporaryFileService.getTemporaryFileConfiguration());
return tryExecute(this.#host, TemporaryFileService.getTemporaryFileConfiguration(), { disableNotifications: true });
}
}

70
src/Umbraco.Web.UI.Client/src/packages/sysinfo/components/sysinfo.element.ts
View File

@@ -5,10 +5,11 @@ import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
import { UmbCurrentUserRepository } from '@umbraco-cms/backoffice/current-user';
import { UmbTemporaryFileConfigRepository } from '@umbraco-cms/backoffice/temporary-file';
type ServerKeyValue = {
name: string;
data: string;
name?: string;
data?: string;
};
@customElement('umb-sysinfo')
@@ -25,6 +26,7 @@ export class UmbSysinfoElement extends UmbModalBaseElement {
readonly #serverKeyValues: Array<ServerKeyValue> = [];
readonly #sysinfoRepository = new UmbSysinfoRepository(this);
readonly #currentUserRepository = new UmbCurrentUserRepository(this);
readonly #temporaryFileConfigRepository = new UmbTemporaryFileConfigRepository(this);
override connectedCallback(): void {
super.connectedCallback();
@@ -35,28 +37,38 @@ export class UmbSysinfoElement extends UmbModalBaseElement {
this._loading = true;
this.#serverKeyValues.length = 0;
const [serverTroubleshooting, serverInformation] = await Promise.all([
this.#sysinfoRepository.requestTroubleShooting(),
this.#sysinfoRepository.requestServerInformation(),
]);
const [serverTroubleshooting, serverInformation, clientInformation, { data: currentUser }, temporaryFileConfig] =
await Promise.all([
this.#sysinfoRepository.requestTroubleShooting(),
this.#sysinfoRepository.requestServerInformation(),
this.#sysinfoRepository.requestClientInformation(),
this.#currentUserRepository.requestCurrentUser(),
this.#temporaryFileConfigRepository.requestTemporaryFileConfiguration(),
]);
this.#serverKeyValues.push({ name: 'Server Troubleshooting' });
if (serverTroubleshooting) {
this.#serverKeyValues.push(...serverTroubleshooting.items);
}
this.#serverKeyValues.push({});
this.#serverKeyValues.push({ name: 'Server Information' });
if (serverInformation) {
this.#serverKeyValues.push({ name: 'Umbraco build version', data: serverInformation.version });
this.#serverKeyValues.push({ name: 'Umbraco assembly version', data: serverInformation.assemblyVersion });
this.#serverKeyValues.push({ name: 'Server time offset', data: serverInformation.baseUtcOffset });
this.#serverKeyValues.push({ name: 'Runtime mode', data: serverInformation.runtimeMode });
}
// Browser information
this.#serverKeyValues.push({ name: 'Browser (user agent)', data: navigator.userAgent });
this.#serverKeyValues.push({ name: 'Browser language', data: navigator.language });
this.#serverKeyValues.push({ name: 'Browser location', data: location.href });
this.#serverKeyValues.push({});
this.#serverKeyValues.push({ name: 'Client Information' });
if (clientInformation) {
this.#serverKeyValues.push({ name: 'Umbraco client version', data: clientInformation.version });
}
// User information
const { data: currentUser } = await this.#currentUserRepository.requestCurrentUser();
this.#serverKeyValues.push({});
this.#serverKeyValues.push({ name: 'Current user' });
if (currentUser) {
this.#serverKeyValues.push({ name: 'User is admin', data: currentUser.isAdmin ? 'Yes' : 'No' });
this.#serverKeyValues.push({ name: 'User sections', data: currentUser.allowedSections.join(', ') });
@@ -67,10 +79,39 @@ export class UmbSysinfoElement extends UmbModalBaseElement {
});
this.#serverKeyValues.push({
name: 'User document start nodes',
data: currentUser.documentStartNodeUniques.length ? currentUser.documentStartNodeUniques.join(', ') : 'None',
data: currentUser.documentStartNodeUniques.join(', '),
});
}
this.#serverKeyValues.push({});
this.#serverKeyValues.push({ name: 'Temporary file configuration' });
// Temporary file configuration
if (temporaryFileConfig) {
this.#serverKeyValues.push({
name: 'Max allowed file size',
data: temporaryFileConfig.maxFileSize?.toString() ?? 'Not set (unlimited)',
});
this.#serverKeyValues.push({
name: 'Allowed file types',
data: temporaryFileConfig.allowedUploadedFileExtensions.join(', '),
});
this.#serverKeyValues.push({
name: 'Disallowed file types',
data: temporaryFileConfig.disallowedUploadedFilesExtensions?.join(', '),
});
this.#serverKeyValues.push({
name: 'Image file types',
data: temporaryFileConfig.imageFileTypes?.join(', '),
});
}
// Browser information
this.#serverKeyValues.push({});
this.#serverKeyValues.push({ name: 'Browser Troubleshooting' });
this.#serverKeyValues.push({ name: 'Browser (user agent)', data: navigator.userAgent });
this.#serverKeyValues.push({ name: 'Browser language', data: navigator.language });
this.#serverKeyValues.push({ name: 'Browser location', data: location.href });
this._systemInformation = this.#renderServerKeyValues();
this._loading = false;
}
@@ -78,7 +119,7 @@ export class UmbSysinfoElement extends UmbModalBaseElement {
#renderServerKeyValues() {
return this.#serverKeyValues
.map((serverKeyValue) => {
return `${serverKeyValue.name}: ${serverKeyValue.data}`;
return serverKeyValue.name ? `${serverKeyValue.name}: ${serverKeyValue.data ?? ''}` : '';
})
.join('\n');
}
@@ -145,8 +186,9 @@ ${this._systemInformation}`;
static override readonly styles = [
UmbTextStyles,
css`
#code-block {
#codeblock {
max-height: 300px;
overflow: auto;
}
`,
];

9
src/Umbraco.Web.UI.Client/src/packages/sysinfo/repository/sysinfo.repository.ts
View File

@@ -1,3 +1,4 @@
import packageJson from '../../../../package.json';
import type { UmbServerUpgradeCheck } from '../types.js';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository';
@@ -20,6 +21,14 @@ export class UmbSysinfoRepository extends UmbRepositoryBase {
return data;
}
async requestClientInformation() {
const { version } = packageJson;
const clientInformation = {
version,
};
return clientInformation;
}
/**
* Check if the server has an upgrade available and return the result.
* If the server has an upgrade available, the result will be stored in local storage.