diff --git a/src/Umbraco.Web.UI.Client/.github/README.md b/src/Umbraco.Web.UI.Client/.github/README.md index cc99c87007..d1e27aa2b0 100644 --- a/src/Umbraco.Web.UI.Client/.github/README.md +++ b/src/Umbraco.Web.UI.Client/.github/README.md @@ -48,6 +48,8 @@ Open this file in an editor: `src/Umbraco.Web.UI/appsettings.Development.json` a This will override the backoffice host URL, enabling the Client to run from a different origin. +Then start the backend server by running the command: `dotnet run` in the `Umbraco.Web.UI` folder. + #### Run the front-end server Now start the Vite server by running the command: `npm run dev:server` in the `Umbraco.Web.UI.Client` folder. diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 8c22e83872..9cebf8987d 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -31,7 +31,7 @@ "@umbraco-ui/uui-css": "^1.12.1", "base64-js": "^1.5.1", "diff": "^7.0.0", - "dompurify": "^3.2.3", + "dompurify": "^3.2.4", "element-internals-polyfill": "^1.3.12", "lit": "^3.2.1", "marked": "^15.0.6", @@ -96,7 +96,7 @@ "typescript": "^5.7.3", "typescript-eslint": "^8.20.0", "typescript-json-schema": "^0.65.1", - "vite": "^5.4.11", + "vite": "^5.4.14", "vite-plugin-static-copy": "^2.2.0", "vite-tsconfig-paths": "^5.1.4", "web-component-analyzer": "^2.0.0" @@ -7667,9 +7667,9 @@ } }, "node_modules/dompurify": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.3.tgz", - "integrity": "sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", "license": "(MPL-2.0 OR Apache-2.0)", "optionalDependencies": { "@types/trusted-types": "^2.0.7" @@ -16371,9 +16371,9 @@ } }, "node_modules/vite": { - "version": "5.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", - "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 57d1359c17..7965d0b882 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -219,7 +219,7 @@ "@umbraco-ui/uui-css": "^1.12.1", "base64-js": "^1.5.1", "diff": "^7.0.0", - "dompurify": "^3.2.3", + "dompurify": "^3.2.4", "element-internals-polyfill": "^1.3.12", "lit": "^3.2.1", "marked": "^15.0.6", @@ -284,7 +284,7 @@ "typescript": "^5.7.3", "typescript-eslint": "^8.20.0", "typescript-json-schema": "^0.65.1", - "vite": "^5.4.11", + "vite": "^5.4.14", "vite-plugin-static-copy": "^2.2.0", "vite-tsconfig-paths": "^5.1.4", "web-component-analyzer": "^2.0.0" diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts index 5a662e9efa..96217fdfa8 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts @@ -1681,6 +1681,7 @@ export default { elementDoesNotSupport: 'Dette benyttes ikke for en Element-type', propertyHasChanges: 'Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?\n ', displaySettingsHeadline: 'Visning', + displaySettingsLabelOnLeft: 'Label på venstre side', displaySettingsLabelOnTop: 'Label hen over (fuld bredde)', removeChildNode: 'Du fjerner noden', removeChildNodeWarning: @@ -1922,6 +1923,8 @@ export default { permissionsDefault: 'Standardrettigheder', permissionsGranular: 'Granulære rettigheder', permissionsGranularHelp: 'Sæt rettigheder for specifikke noder', + granularRightsLabel: 'Dokumenter', + granularRightsDescription: 'Tillad adgang til specifikke dokumenter', permissionsEntityGroup_document: 'Indhold', permissionsEntityGroup_media: 'Medie', permissionsEntityGroup_member: 'Medlemmer', @@ -1938,6 +1941,8 @@ export default { chooseUserGroup: (multiple: boolean) => { return multiple ? 'Vælg brugergrupper' : 'Vælg brugergruppe'; }, + entityPermissionsLabel: 'Handlingsrettigheder', + entityPermissionsDescription: 'Tildel tilladelser til handlinger', noStartNode: 'Ingen startnode valgt', noStartNodes: 'Ingen startnoder valgt', startnode: 'Indhold startnode', @@ -2024,6 +2029,7 @@ export default { }, validation: { validation: 'Validering', + validateNothing: 'Ingen validering', validateAsEmail: 'Valider som e-mail', validateAsNumber: 'Valider som tal', validateAsUrl: 'Valider som URL', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts index 22cda2c9b2..3bfd73c949 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts @@ -1715,6 +1715,7 @@ export default { elementDoesNotSupport: 'This is not applicable for an Element Type', propertyHasChanges: 'You have made changes to this property. Are you sure you want to discard them?', displaySettingsHeadline: 'Appearance', + displaySettingsLabelOnLeft: 'Label to the left', displaySettingsLabelOnTop: 'Label above (full-width)', confirmDeleteTabMessage: 'Are you sure you want to delete the tab %0%?', confirmDeleteGroupMessage: 'Are you sure you want to delete the group %0%?', @@ -1971,6 +1972,8 @@ export default { permissionsDefault: 'Default permissions', permissionsGranular: 'Granular permissions', permissionsGranularHelp: 'Set permissions for specific nodes', + granularRightsLabel: 'Documents', + granularRightsDescription: 'Assign permissions to specific documents', permissionsEntityGroup_document: 'Content', permissionsEntityGroup_media: 'Media', permissionsEntityGroup_member: 'Member', @@ -1987,6 +1990,8 @@ export default { chooseUserGroup: (multiple: boolean) => { return multiple ? 'Choose User Groups' : 'Choose User Group'; }, + entityPermissionsLabel: 'Permissions', + entityPermissionsDescription: 'Assign permissions for actions', noStartNode: 'No start node selected', noStartNodes: 'No start nodes selected', startnode: 'Content start node', @@ -2060,6 +2065,7 @@ export default { }, validation: { validation: 'Validation', + validateNothing: 'No validation', validateAsEmail: 'Validate as an email address', validateAsNumber: 'Validate as a number', validateAsUrl: 'Validate as a URL', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index 3dd24d3ce5..75387bc550 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -2030,6 +2030,8 @@ export default { permissionsDefault: 'Default permissions', permissionsGranular: 'Granular permissions', permissionsGranularHelp: 'Set permissions for specific nodes', + granularRightsLabel: 'Documents', + granularRightsDescription: 'Assign permissions to specific documents', permissionsEntityGroup_document: 'Content', permissionsEntityGroup_media: 'Media', permissionsEntityGroup_member: 'Member', @@ -2046,6 +2048,8 @@ export default { chooseUserGroup: (multiple: boolean) => { return multiple ? 'Choose User Groups' : 'Choose User Group'; }, + entityPermissionsLabel: 'Permissions', + entityPermissionsDescription: 'Assign permissions for actions', noStartNode: 'No start node selected', noStartNodes: 'No start nodes selected', startnode: 'Content start node', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts index a92627d95d..eed8e34b53 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/umb-app-auth-modal.element.ts @@ -170,7 +170,7 @@ export class UmbAppAuthModalElement extends UmbModalBaseElement = [ import('./input-document-granular-user-permission/input-document-granular-user-permission.element.js'), meta: { schemaType: 'DocumentPermissionPresentationModel', - label: 'Documents', - description: 'Assign permissions to specific documents', + label: '#user_granularRightsLabel', + description: '{#user_granularRightsDescription}', }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts index 97124b0c4c..aae6d579e9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts @@ -244,7 +244,7 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
- +