From 4606db37e72aa32edd43d449a800161e2ab8e6d0 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:37:32 +0200 Subject: [PATCH 1/6] add exitCode = 1 to fail the build --- .../devops/build/check-path-length.js | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js b/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js index d21097639b..6bedb82371 100644 --- a/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js +++ b/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js @@ -7,6 +7,9 @@ const IS_CI = process.env.CI === 'true'; const IS_AZURE_PIPELINES = process.env.TF_BUILD === 'true'; const IS_GITHUB_ACTIONS = process.env.GITHUB_ACTIONS === 'true'; const FILE_PATH_COLOR = '\x1b[36m%s\x1b[0m'; +const ERROR_COLOR = '\x1b[31m%s\x1b[0m'; +const SUCCESS_COLOR = '\x1b[32m%s\x1b[0m'; +const processExitCode = 1; // Default to 1 to fail the build, 0 to just log the issues console.log(`Checking path length in ${PROJECT_DIR} for paths exceeding ${MAX_PATH_LENGTH}...`); console.log('CI detected:', IS_CI); @@ -17,14 +20,12 @@ console.log('-----------------------------------\n'); function checkPathLength(dir) { const files = readdirSync(dir); + let hasError = false; files.forEach(file => { const filePath = join(dir, file); if (filePath.length > MAX_PATH_LENGTH) { - - if (IS_CI) { - //process.exitCode = 1; // TODO: Uncomment this line to fail the build - } + hasError = true; if (IS_AZURE_PIPELINES) { console.error(`##vso[task.logissue type=warning;sourcepath=${filePath};]Path exceeds maximum length of ${MAX_PATH_LENGTH} characters: ${filePath} with ${filePath.length} characters`); @@ -36,9 +37,27 @@ function checkPathLength(dir) { } if (statSync(filePath).isDirectory()) { - checkPathLength(filePath, MAX_PATH_LENGTH); + const subHasError = checkPathLength(filePath); + if (subHasError) { + hasError = true; + } } }); + + return hasError; } -checkPathLength(PROJECT_DIR, MAX_PATH_LENGTH); +const hasError = checkPathLength(PROJECT_DIR, MAX_PATH_LENGTH); + +if (hasError) { + console.error('\n-----------------------------------'); + console.error(ERROR_COLOR, 'Path length check failed'); + console.error('-----------------------------------\n'); + if (processExitCode) { + process.exit(processExitCode); + } +} else { + console.log('\n-----------------------------------'); + console.log(SUCCESS_COLOR, 'Path length check passed'); + console.log('-----------------------------------\n'); +} From e2d99208493434dc7af1da87cbf23f1cdeef05f6 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:37:54 +0200 Subject: [PATCH 2/6] only fail the build on CI --- src/Umbraco.Web.UI.Client/devops/build/check-path-length.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js b/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js index 6bedb82371..e195c7e7c0 100644 --- a/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js +++ b/src/Umbraco.Web.UI.Client/devops/build/check-path-length.js @@ -53,7 +53,7 @@ if (hasError) { console.error('\n-----------------------------------'); console.error(ERROR_COLOR, 'Path length check failed'); console.error('-----------------------------------\n'); - if (processExitCode) { + if (IS_CI && processExitCode) { process.exit(processExitCode); } } else { From 056ff565ddc64ceee40704ef405364901b7695a2 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:40:32 +0200 Subject: [PATCH 3/6] rename element to avoid long path names --- .../block-grid-area-config-entry/workspace/views/manifests.ts | 2 +- ...e-workspace-view-settings.element.ts => settings.element.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/{block-grid-area-type-workspace-view-settings.element.ts => settings.element.ts} (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/manifests.ts index 10a379a924..c92f2b2d77 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/manifests.ts @@ -6,7 +6,7 @@ export const workspaceViews: Array = [ type: 'workspaceView', alias: 'Umb.WorkspaceView.BlockGridAreaType.Settings', name: 'Block Grid Area Type Workspace Settings View', - js: () => import('./block-grid-area-type-workspace-view-settings.element.js'), + js: () => import('./settings.element.js'), weight: 1000, meta: { label: 'Settings', diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/block-grid-area-type-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/settings.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/block-grid-area-type-workspace-view-settings.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/views/settings.element.ts From 5417a2b941665520a370b5de2f8233ee5a361438 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:43:00 +0200 Subject: [PATCH 4/6] rename element to avoid long path names --- .../config/bulk-action-permissions/manifests.ts | 2 +- ...ection-view-bulk-action-permissions.stories.ts | 15 --------------- ...tor-ui-collection-view-permissions.element.ts} | 12 ++++++------ ...itor-ui-collection-view-permissions.stories.ts | 15 +++++++++++++++ ...editor-ui-collection-view-permissions.test.ts} | 10 +++++----- 5 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{property-editor-ui-collection-view-bulk-action-permissions.element.ts => property-editor-ui-collection-view-permissions.element.ts} (86%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.stories.ts rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{property-editor-ui-collection-view-bulk-action-permissions.test.ts => property-editor-ui-collection-view-permissions.test.ts} (53%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts index f0fda71aaa..b18d13a316 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.BulkActionPermissions', name: 'Collection View Bulk Action Permissions Property Editor UI', - element: () => import('./property-editor-ui-collection-view-bulk-action-permissions.element.js'), + element: () => import('./property-editor-ui-collection-view-permissions.element.js'), meta: { label: 'Collection View Bulk Action Permissions', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts deleted file mode 100644 index 1fdeb9e17a..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.stories.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewBulkActionPermissionsElement } from './property-editor-ui-collection-view-bulk-action-permissions.element.js'; -import { html } from '@umbraco-cms/backoffice/external/lit'; - -import './property-editor-ui-collection-view-bulk-action-permissions.element.js'; - -export default { - title: 'Property Editor UIs/Collection View Bulk Action Permissions', - component: 'umb-property-editor-ui-collection-view-bulk-action-permissions', - id: 'umb-property-editor-ui-collection-view-bulk-action-permissions', -} as Meta; - -export const AAAOverview: Story = () => - html``; -AAAOverview.storyName = 'Overview'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.element.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.element.ts index 4915a0d8ca..9233e7b7d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.element.ts @@ -1,4 +1,4 @@ -import type { UmbCollectionBulkActionPermissions } from '../../../../../../core/collection/types.js'; +import type { UmbCollectionBulkActionPermissions } from '../../../../../collection/types.js'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; import { html, customElement, property, css } from '@umbraco-cms/backoffice/external/lit'; import type { UUIBooleanInputEvent } from '@umbraco-cms/backoffice/external/uui'; @@ -15,10 +15,10 @@ type BulkActionPermissionType = | 'allowBulkUnpublish'; /** - * @element umb-property-editor-ui-collection-view-bulk-action-permissions + * @element umb-property-editor-ui-collection-view-permissions */ -@customElement('umb-property-editor-ui-collection-view-bulk-action-permissions') -export class UmbPropertyEditorUICollectionViewBulkActionPermissionsElement +@customElement('umb-property-editor-ui-collection-view-permissions') +export class UmbPropertyEditorUICollectionViewPermissionsElement extends UmbLitElement implements UmbPropertyEditorUiElement { @@ -98,10 +98,10 @@ export class UmbPropertyEditorUICollectionViewBulkActionPermissionsElement ]; } -export default UmbPropertyEditorUICollectionViewBulkActionPermissionsElement; +export default UmbPropertyEditorUICollectionViewPermissionsElement; declare global { interface HTMLElementTagNameMap { - 'umb-property-editor-ui-collection-view-bulk-action-permissions': UmbPropertyEditorUICollectionViewBulkActionPermissionsElement; + 'umb-property-editor-ui-collection-view-permissions': UmbPropertyEditorUICollectionViewPermissionsElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.stories.ts new file mode 100644 index 0000000000..d842bfbeac --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.stories.ts @@ -0,0 +1,15 @@ +import type { Meta, Story } from '@storybook/web-components'; +import type { UmbPropertyEditorUICollectionViewPermissionsElement } from './property-editor-ui-collection-view-permissions.element.js'; +import { html } from '@umbraco-cms/backoffice/external/lit'; + +import './property-editor-ui-collection-view-permissions.element.js'; + +export default { + title: 'Property Editor UIs/Collection View Bulk Action Permissions', + component: 'umb-property-editor-ui-collection-view-permissions', + id: 'umb-property-editor-ui-collection-view-permissions', +} as Meta; + +export const AAAOverview: Story = () => + html``; +AAAOverview.storyName = 'Overview'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.test.ts similarity index 53% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.test.ts index 019979333e..447e49951c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-bulk-action-permissions.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.test.ts @@ -1,18 +1,18 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewBulkActionPermissionsElement } from './property-editor-ui-collection-view-bulk-action-permissions.element.js'; +import { UmbPropertyEditorUICollectionViewPermissionsElement } from './property-editor-ui-collection-view-permissions.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; -describe('UmbPropertyEditorUICollectionViewBulkActionPermissionsElement', () => { - let element: UmbPropertyEditorUICollectionViewBulkActionPermissionsElement; +describe('UmbPropertyEditorUICollectionViewPermissionsElement', () => { + let element: UmbPropertyEditorUICollectionViewPermissionsElement; beforeEach(async () => { element = await fixture(html` - + `); }); it('is defined with its own instance', () => { - expect(element).to.be.instanceOf(UmbPropertyEditorUICollectionViewBulkActionPermissionsElement); + expect(element).to.be.instanceOf(UmbPropertyEditorUICollectionViewPermissionsElement); }); if ((window as UmbTestRunnerWindow).__UMBRACO_TEST_RUN_A11Y_TEST) { From 16ccbdd765f5c3dc015b48682d96be2b2afdc03b Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 4 Apr 2024 09:55:23 +0200 Subject: [PATCH 5/6] collection view: rename long file paths to avoid errors --- ...ions.element.ts => collection-view-permissions.element.ts} | 0 ...ions.stories.ts => collection-view-permissions.stories.ts} | 4 ++-- ...ermissions.test.ts => collection-view-permissions.test.ts} | 2 +- .../config/bulk-action-permissions/manifests.ts | 2 +- ...ent.ts => collection-view-column-configuration.element.ts} | 0 ...ies.ts => collection-view-column-configuration.stories.ts} | 4 ++-- ...n.test.ts => collection-view-column-configuration.test.ts} | 2 +- .../collection-view/config/column-configuration/manifests.ts | 2 +- ...ent.ts => collection-view-layout-configuration.element.ts} | 0 ...ies.ts => collection-view-layout-configuration.stories.ts} | 4 ++-- ...n.test.ts => collection-view-layout-configuration.test.ts} | 2 +- .../collection-view/config/layout-configuration/manifests.ts | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{property-editor-ui-collection-view-permissions.element.ts => collection-view-permissions.element.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{property-editor-ui-collection-view-permissions.stories.ts => collection-view-permissions.stories.ts} (82%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{property-editor-ui-collection-view-permissions.test.ts => collection-view-permissions.test.ts} (92%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/{property-editor-ui-collection-view-column-configuration.element.ts => collection-view-column-configuration.element.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/{property-editor-ui-collection-view-column-configuration.stories.ts => collection-view-column-configuration.stories.ts} (80%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/{property-editor-ui-collection-view-column-configuration.test.ts => collection-view-column-configuration.test.ts} (91%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/{property-editor-ui-collection-view-layout-configuration.element.ts => collection-view-layout-configuration.element.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/{property-editor-ui-collection-view-layout-configuration.stories.ts => collection-view-layout-configuration.stories.ts} (80%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/{property-editor-ui-collection-view-layout-configuration.test.ts => collection-view-layout-configuration.test.ts} (91%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.stories.ts similarity index 82% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.stories.ts index d842bfbeac..c3d487d518 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.stories.ts @@ -1,8 +1,8 @@ import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewPermissionsElement } from './property-editor-ui-collection-view-permissions.element.js'; +import type { UmbPropertyEditorUICollectionViewPermissionsElement } from './collection-view-permissions.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; -import './property-editor-ui-collection-view-permissions.element.js'; +import './collection-view-permissions.element.js'; export default { title: 'Property Editor UIs/Collection View Bulk Action Permissions', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.test.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.test.ts index 447e49951c..2c5ad39706 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/property-editor-ui-collection-view-permissions.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewPermissionsElement } from './property-editor-ui-collection-view-permissions.element.js'; +import { UmbPropertyEditorUICollectionViewPermissionsElement } from './collection-view-permissions.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUICollectionViewPermissionsElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts index b18d13a316..c92c2dd5a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.BulkActionPermissions', name: 'Collection View Bulk Action Permissions Property Editor UI', - element: () => import('./property-editor-ui-collection-view-permissions.element.js'), + element: () => import('./collection-view-permissions.element.js'), meta: { label: 'Collection View Bulk Action Permissions', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.stories.ts similarity index 80% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.stories.ts index 961a2454cf..38716911dd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.stories.ts @@ -1,8 +1,8 @@ import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './property-editor-ui-collection-view-column-configuration.element.js'; +import type { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './collection-view-column-configuration.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; -import './property-editor-ui-collection-view-column-configuration.element.js'; +import './collection-view-column-configuration.element.js'; export default { title: 'Property Editor UIs/Collection View Column Configuration', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.test.ts similarity index 91% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.test.ts index 9bc2a6e955..8046077b20 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/property-editor-ui-collection-view-column-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './property-editor-ui-collection-view-column-configuration.element.js'; +import { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './collection-view-column-configuration.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUICollectionViewColumnConfigurationElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts index d06c7f1ade..02fe1f5ad4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.ColumnConfiguration', name: 'Collection View Column Configuration Property Editor UI', - element: () => import('./property-editor-ui-collection-view-column-configuration.element.js'), + element: () => import('./collection-view-column-configuration.element.js'), meta: { label: 'Collection View Column Configuration', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.stories.ts similarity index 80% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.stories.ts index c1e3cd0f17..7820bd82e6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.stories.ts @@ -1,8 +1,8 @@ import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './property-editor-ui-collection-view-layout-configuration.element.js'; +import type { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './collection-view-layout-configuration.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; -import './property-editor-ui-collection-view-layout-configuration.element.js'; +import './collection-view-layout-configuration.element.js'; export default { title: 'Property Editor UIs/Collection View Layout Configuration', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.test.ts similarity index 91% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.test.ts index 602083f78a..3540c4ec5a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/property-editor-ui-collection-view-layout-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './property-editor-ui-collection-view-layout-configuration.element.js'; +import { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './collection-view-layout-configuration.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUICollectionViewLayoutConfigurationElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts index 411d187f3d..f37a31e531 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.LayoutConfiguration', name: 'Collection View Column Configuration Property Editor UI', - element: () => import('./property-editor-ui-collection-view-layout-configuration.element.js'), + element: () => import('./collection-view-layout-configuration.element.js'), meta: { label: 'Collection View Layout Configuration', icon: 'icon-autofill', From 5e586ab58b03d4d7e5463d836f17b7a06e366954 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 4 Apr 2024 10:00:48 +0200 Subject: [PATCH 6/6] remove prefix of "collection-view" and "property-editor-ui" from collection views to limit the path lengths --- .../config/bulk-action-permissions/manifests.ts | 2 +- ...ion-view-permissions.element.ts => permissions.element.ts} | 0 ...ion-view-permissions.stories.ts => permissions.stories.ts} | 4 ++-- ...ollection-view-permissions.test.ts => permissions.test.ts} | 2 +- .../column-configuration.element.ts} | 0 .../column-configuration.stories.ts} | 4 ++-- .../column-configuration.test.ts} | 2 +- .../config/{column-configuration => column}/manifests.ts | 2 +- .../layout-configuration.element.ts} | 0 .../layout-configuration.stories.ts} | 4 ++-- .../layout-configuration.test.ts} | 2 +- .../config/{layout-configuration => layout}/manifests.ts | 2 +- .../uis/collection-view/config/order-by/manifests.ts | 2 +- ...ollection-view-order-by.element.ts => order-by.element.ts} | 0 ...ollection-view-order-by.stories.ts => order-by.stories.ts} | 4 ++-- ...r-ui-collection-view-order-by.test.ts => order-by.test.ts} | 2 +- .../core/property-editor/uis/collection-view/manifests.ts | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{collection-view-permissions.element.ts => permissions.element.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{collection-view-permissions.stories.ts => permissions.stories.ts} (86%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/{collection-view-permissions.test.ts => permissions.test.ts} (94%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{column-configuration/collection-view-column-configuration.element.ts => column/column-configuration.element.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{column-configuration/collection-view-column-configuration.stories.ts => column/column-configuration.stories.ts} (84%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{column-configuration/collection-view-column-configuration.test.ts => column/column-configuration.test.ts} (93%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{column-configuration => column}/manifests.ts (84%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{layout-configuration/collection-view-layout-configuration.element.ts => layout/layout-configuration.element.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{layout-configuration/collection-view-layout-configuration.stories.ts => layout/layout-configuration.stories.ts} (84%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{layout-configuration/collection-view-layout-configuration.test.ts => layout/layout-configuration.test.ts} (93%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/{layout-configuration => layout}/manifests.ts (84%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/{property-editor-ui-collection-view-order-by.element.ts => order-by.element.ts} (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/{property-editor-ui-collection-view-order-by.stories.ts => order-by.stories.ts} (82%) rename src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/{property-editor-ui-collection-view-order-by.test.ts => order-by.test.ts} (93%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts index c92c2dd5a8..1a9b24ee5f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.BulkActionPermissions', name: 'Collection View Bulk Action Permissions Property Editor UI', - element: () => import('./collection-view-permissions.element.js'), + element: () => import('./permissions.element.js'), meta: { label: 'Collection View Bulk Action Permissions', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.stories.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.stories.ts index c3d487d518..f9d86ec016 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.stories.ts @@ -1,8 +1,8 @@ import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewPermissionsElement } from './collection-view-permissions.element.js'; +import type { UmbPropertyEditorUICollectionViewPermissionsElement } from './permissions.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; -import './collection-view-permissions.element.js'; +import './permissions.element.js'; export default { title: 'Property Editor UIs/Collection View Bulk Action Permissions', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.test.ts similarity index 94% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.test.ts index 2c5ad39706..94d53fe617 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/collection-view-permissions.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/bulk-action-permissions/permissions.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewPermissionsElement } from './collection-view-permissions.element.js'; +import { UmbPropertyEditorUICollectionViewPermissionsElement } from './permissions.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUICollectionViewPermissionsElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.stories.ts similarity index 84% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.stories.ts index 38716911dd..21ef92946c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.stories.ts @@ -1,8 +1,8 @@ import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './collection-view-column-configuration.element.js'; +import type { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './column-configuration.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; -import './collection-view-column-configuration.element.js'; +import './column-configuration.element.js'; export default { title: 'Property Editor UIs/Collection View Column Configuration', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.test.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.test.ts index 8046077b20..bb0b17070f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/collection-view-column-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/column-configuration.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './collection-view-column-configuration.element.js'; +import { UmbPropertyEditorUICollectionViewColumnConfigurationElement } from './column-configuration.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUICollectionViewColumnConfigurationElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/manifests.ts similarity index 84% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/manifests.ts index 02fe1f5ad4..7f1500ee96 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/column/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.ColumnConfiguration', name: 'Collection View Column Configuration Property Editor UI', - element: () => import('./collection-view-column-configuration.element.js'), + element: () => import('./column-configuration.element.js'), meta: { label: 'Collection View Column Configuration', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.stories.ts similarity index 84% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.stories.ts index 7820bd82e6..e9da7ae5df 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.stories.ts @@ -1,8 +1,8 @@ import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './collection-view-layout-configuration.element.js'; +import type { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './layout-configuration.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; -import './collection-view-layout-configuration.element.js'; +import './layout-configuration.element.js'; export default { title: 'Property Editor UIs/Collection View Layout Configuration', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.test.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.test.ts index 3540c4ec5a..bb009fe9ea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/collection-view-layout-configuration.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/layout-configuration.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './collection-view-layout-configuration.element.js'; +import { UmbPropertyEditorUICollectionViewLayoutConfigurationElement } from './layout-configuration.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUICollectionViewLayoutConfigurationElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/manifests.ts similarity index 84% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/manifests.ts index f37a31e531..310c0ce22b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout-configuration/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/layout/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.LayoutConfiguration', name: 'Collection View Column Configuration Property Editor UI', - element: () => import('./collection-view-layout-configuration.element.js'), + element: () => import('./layout-configuration.element.js'), meta: { label: 'Collection View Layout Configuration', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts index d8871bb956..4ce645e9fb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/manifests.ts @@ -4,7 +4,7 @@ export const manifest: ManifestPropertyEditorUi = { type: 'propertyEditorUi', alias: 'Umb.PropertyEditorUi.CollectionView.OrderBy', name: 'Collection View Column Configuration Property Editor UI', - element: () => import('./property-editor-ui-collection-view-order-by.element.js'), + element: () => import('./order-by.element.js'), meta: { label: 'Collection View Order By', icon: 'icon-autofill', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.stories.ts similarity index 82% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.stories.ts index 611de8458b..d16e448f1e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.stories.ts @@ -1,8 +1,8 @@ import type { Meta, Story } from '@storybook/web-components'; -import type { UmbPropertyEditorUICollectionViewOrderByElement } from './property-editor-ui-collection-view-order-by.element.js'; +import type { UmbPropertyEditorUICollectionViewOrderByElement } from './order-by.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; -import './property-editor-ui-collection-view-order-by.element.js'; +import './order-by.element.js'; export default { title: 'Property Editor UIs/Collection View Order By', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.test.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.test.ts index 15614d6781..a3c53b41db 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/property-editor-ui-collection-view-order-by.test.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/config/order-by/order-by.test.ts @@ -1,5 +1,5 @@ import { expect, fixture, html } from '@open-wc/testing'; -import { UmbPropertyEditorUICollectionViewOrderByElement } from './property-editor-ui-collection-view-order-by.element.js'; +import { UmbPropertyEditorUICollectionViewOrderByElement } from './order-by.element.js'; import { type UmbTestRunnerWindow, defaultA11yConfig } from '@umbraco-cms/internal/test-utils'; describe('UmbPropertyEditorUICollectionViewOrderByElement', () => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts index 33e003f94a..a327ffc009 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/collection-view/manifests.ts @@ -1,6 +1,6 @@ import { manifest as bulkActionPermissions } from './config/bulk-action-permissions/manifests.js'; -import { manifest as columnConfiguration } from './config/column-configuration/manifests.js'; -import { manifest as layoutConfiguration } from './config/layout-configuration/manifests.js'; +import { manifest as columnConfiguration } from './config/column/manifests.js'; +import { manifest as layoutConfiguration } from './config/layout/manifests.js'; import { manifest as orderBy } from './config/order-by/manifests.js'; import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry';