Merge branch 'main' into v14/chore/bundle-templating-package

Author: madsrasmussen

.github/README.md

@@ -29,9 +29,6 @@ The development environment is the default environment and is used when running
 
 ### Run against a local Umbraco instance
 
-> **Note**
-> Make sure you have followed the [Authentication guide](https://github.com/umbraco/Umbraco.CMS.Backoffice/blob/main/docs/authentication.md) before continuing.
-
 If you have a local Umbraco instance running, you can use the development environment to run against it by overriding the API URL and bypassing the mock-service-worker in the frontend client.
 
 Create a `.env.local` file and set the following variables:
@@ -41,14 +38,37 @@ VITE_UMBRACO_API_URL=https://localhost:44339 # This will be the URL to your Umbr
 VITE_UMBRACO_USE_MSW=off # Indicate that you want all API calls to bypass MSW (mock-service-worker)
 ```
 
+Open this file in an editor: `src/Umbraco.Web.UI/appsettings.Development.json` and add this to the `Umbraco:CMS:Security` section to override the backoffice host:
+
+```json
+"Umbraco": {
+	"CMS": {
+		"Security":{
+			"BackOfficeHost": "http://localhost:5173",
+			"AuthorizeCallbackPathName": "/oauth_complete",
+			"AuthorizeCallbackLogoutPathName": "/logout",
+			"AuthorizeCallbackErrorPathName": "/error",
+		},
+	},
+}
+```
+
+Now start the vite server: `npm run dev:server` in your backoffice folder and open the http://localhost:5173 URL in your browser.
+
 ### Storybook
 
 Storybook is also being built and deployed automatically on the Main branch, including a preview URL on each pull request. See it in action on this [Azure Static Web App](https://ambitious-stone-0033b3603.1.azurestaticapps.net/).
 
+You can test the Storybook locally by running `npm run storybook`. This will start the Storybook server and open a browser window with the Storybook UI.
+
+Storybook is an excellent tool to test out UI components in isolation and to document them. It is also a great way to test the responsiveness and accessibility of the components.
+
 ## Contributing
 
-We accept contributions to this project. However be aware that we are mainly working on a private backlog, so not everyone will be immediately obvious. If you want to get started on contributing, please read the [contribute space](https://github.com/umbraco/Umbraco.CMS.Backoffice/contribute) where you will be able to find the guidelines on how to contribute as well as a list of good first issues.
+We accept contributions to this project. However be aware that we are mainly working on a private backlog, so not everything will be immediately obvious. If you want to get started on contributing, please read the [contributing guidelines](./CONTRIBUTING.md).
+
+A list of issues can be found on the [Umbraco-CMS Issue Tracker](https://github.com/umbraco/Umbraco-CMS/issues). Many of them are marked as `community/up-for-grabs` which means they are up for grabs for anyone to work on.
 
 ## Documentation
 
-The documentation can be found on [Umbraco Docs](https://docs.umbraco.com/umbraco-backoffice/). The documentation is a work in progress.
+The documentation can be found on [Umbraco Docs](https://docs.umbraco.com/umbraco-cms).

docs/authentication.md

@@ -119,7 +119,7 @@
 		"type": "git"
 	},
 	"bugs": {
-		"url": "https://github.com/umbraco/Umbraco.CMS.Backoffice/issues"
+		"url": "https://github.com/umbraco/Umbraco-CMS/issues"
 	},
 	"author": {
 		"name": "Umbraco A/S",

package.json

@@ -1587,7 +1587,7 @@ export default {
 		requiredLabel: 'Påkrævet label',
 		enableListViewHeading: 'Aktivér listevisning',
 		enableListViewDescription:
-			'Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste;\n      undersider vil ikke blive vist i træet\n    ',
+			'Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste.',
 		allowedTemplatesHeading: 'Tilladte skabeloner',
 		allowedTemplatesDescription: 'Vælg hvilke skabeloner, der er tilladt at bruge på dette indhold.',
 		allowAtRootHeading: 'Tillad på rodniveau',
@@ -1682,7 +1682,7 @@ export default {
 			'Changing a data type with stored values is disabled. To allow this you can change the Umbraco:CMS:DataTypes:CanBeChanged setting in appsettings.json.',
 		collections: 'Samlinger',
 		collectionsDescription:
-			'Konfigurerer indholdselementet til at vise listen over dets underordnede elementer, underordnede elementer vil ikke blive vist i træet.',
+			'Konfigurerer indholdselementet til at vise listen over dets underordnede elementer.',
 		structure: 'Struktur',
 		presentation: 'Præsentation',
 	},

src/assets/lang/da-dk.ts

@@ -1601,7 +1601,7 @@ export default {
 		requiredLabel: 'Required label',
 		enableListViewHeading: 'Enable list view',
 		enableListViewDescription:
-			'Configures the content item to show a sortable and searchable list of its\n      children, the children will not be shown in the tree\n    ',
+			'Configures the content item to show a sortable and searchable list of its children.',
 		allowedTemplatesHeading: 'Allowed Templates',
 		allowedTemplatesDescription: 'Choose which templates editors are allowed to use on content of this type',
 		allowAtRootHeading: 'Allow at root',
@@ -1694,7 +1694,7 @@ export default {
 			'Changing a data type with stored values is disabled. To allow this you can change the Umbraco:CMS:DataTypes:CanBeChanged setting in appsettings.json.',
 		collections: 'Collections',
 		collectionsDescription:
-			'Configures the content item to show list of its children, the children will not be shown in the tree.',
+			'Configures the content item to show list of its children.',
 		structure: 'Structure',
 		presentation: 'Presentation',
 	},

src/assets/lang/en-us.ts

@@ -1624,7 +1624,7 @@ export default {
 		requiredLabel: 'Required label',
 		enableListViewHeading: 'Enable list view',
 		enableListViewDescription:
-			'Configures the content item to show a sortable and searchable list of its\n      children, the children will not be shown in the tree\n    ',
+			'Configures the content item to show a sortable and searchable list of its children.',
 		allowedTemplatesHeading: 'Allowed Templates',
 		allowedTemplatesDescription: 'Choose which templates editors are allowed to use on content of this type',
 		allowAtRootHeading: 'Allow at root',
@@ -1718,7 +1718,7 @@ export default {
 			'Changing a data type with stored values is disabled. To allow this you can change the Umbraco:CMS:DataTypes:CanBeChanged setting in appsettings.json.',
 		collections: 'Collections',
 		collectionsDescription:
-			'Configures the content item to show list of its children, the children will not be shown in the tree.',
+			'Configures the content item to show list of its children.',
 		structure: 'Structure',
 		presentation: 'Presentation',
 	},

src/assets/lang/en.ts

@@ -1,15 +1,15 @@
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbObjectState, appendToFrozenArray } from '@umbraco-cms/backoffice/observable-api';
+import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
+import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property';
+import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
+import { UMB_BLOCK_GRID_AREA_TYPE_ENTRIES_CONTEXT } from '../../property-editors/block-grid-areas-config/block-grid-area-type-entries.context-token.js';
 import {
 	UmbBlockGridScaleManager,
 	type UmbBlockGridScalableContext,
 } from '../../context/block-grid-scale-manager/block-grid-scale-manager.controller.js';
-import { UMB_BLOCK_GRID_AREA_TYPE_ENTRIES_CONTEXT } from '../../property-editors/block-grid-areas-config/block-grid-area-type-entries.context-token.js';
 import { UMB_BLOCK_GRID_AREA_CONFIG_ENTRY_CONTEXT } from './block-grid-area-config-entry.context-token.js';
 import type { UmbBlockGridTypeAreaType } from '@umbraco-cms/backoffice/block-grid';
-import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
-import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
-import { UMB_PROPERTY_CONTEXT } from '@umbraco-cms/backoffice/property';
-import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 export class UmbBlockGridAreaConfigEntryContext
 	extends UmbContextBase<UmbBlockGridAreaConfigEntryContext>
 	implements UmbBlockGridScalableContext
@@ -21,6 +21,7 @@ export class UmbBlockGridAreaConfigEntryContext
 	//
 	#areaKey?: string;
 	#area = new UmbObjectState<UmbBlockGridTypeAreaType | undefined>(undefined);
+	readonly area = this.#area.asObservable();
 	readonly alias = this.#area.asObservablePart((x) => x?.alias);
 	readonly columnSpan = this.#area.asObservablePart((x) => x?.columnSpan);
 	readonly rowSpan = this.#area.asObservablePart((x) => x?.rowSpan ?? 1);
@@ -85,7 +86,19 @@ export class UmbBlockGridAreaConfigEntryContext
 					this.#area.setValue(areaType);
 				}
 			},
-			'observeAreaKey',
+			'observeAreaData',
+		);
+		this.observe(
+			this.area,
+			(area) => {
+				if (area && this.#propertyContext) {
+					const value = this.#propertyContext.getValue() as Array<UmbBlockGridTypeAreaType> | undefined;
+					if (!value) return;
+					const newValue = appendToFrozenArray(value, area, (x) => x.key === this.#areaKey);
+					this.#propertyContext?.setValue(newValue);
+				}
+			},
+			'observeInternalArea',
 		);
 	}
 

src/packages/block/block-grid/components/block-grid-area-config-entry/block-grid-area-config-entry.context.ts

@@ -1,8 +1,8 @@
+export * from './entity.js';
+export * from './global-components/index.js';
 export * from './repository/index.js';
 export * from './tree/index.js';
 export * from './types.js';
-export * from './entity.js';
-export * from './global-components/index.js';
 export * from './workspace/script-workspace.context-token.js';
 
 export { UMB_SCRIPT_PICKER_MODAL } from './modals/script-picker-modal.token.js';