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

do not not accept scaffold model from modals

Browse Source
This commit is contained in:
Niels Lyngsø
2024-01-30 16:31:56 +01:00
parent 6b7223cc14
commit 88e1588d89
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/packages/core/modal/token/property-settings-modal.token.ts
View File

@@ -1,10 +1,10 @@
import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type';
import type { UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from '@umbraco-cms/backoffice/content-type';
import { UmbModalToken } from '@umbraco-cms/backoffice/modal';
export type UmbPropertySettingsModalData = {
documentTypeId: string;
};
export type UmbPropertySettingsModalValue = UmbPropertyTypeModel;
export type UmbPropertySettingsModalValue = UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel;
export const UMB_PROPERTY_SETTINGS_MODAL = new UmbModalToken<
UmbPropertySettingsModalData,

5
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts
View File

@@ -96,7 +96,10 @@ export class UmbDocumentTypeWorkspacePropertyElement extends UmbLitElement {
return { data: { documentTypeId }, value: propertyData };
})
.onSubmit((result) => {
this._partialUpdate(result);
if (!result.dataType) {
throw new Error('No dataType found on property');
}
this._partialUpdate(result as UmbPropertyTypeModel);
})
.observeRouteBuilder((routeBuilder) => {
this._modalRoute = routeBuilder(null);

5
src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-properties.element.ts
View File

@@ -142,7 +142,10 @@ export class UmbMediaTypeWorkspaceViewEditPropertiesElement extends UmbLitElemen
return { data: { documentTypeId: mediaTypeId }, value: propertyData }; //TODO: Should we have a separate modal for mediaTypes?
})
.onSubmit((value) => {
this.#addProperty(value);
if (!value.dataType) {
throw new Error('No data type selected');
}
this.#addProperty(value as UmbPropertyTypeModel);
})
.observeRouteBuilder((routeBuilder) => {
this._modalRouteNewProperty = routeBuilder(null);

5
src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts
View File

@@ -96,7 +96,10 @@ export class UmbMediaTypeWorkspacePropertyElement extends UmbLitElement {
return { data: { documentTypeId: mediaTypeId }, value: propertyData }; //TODO: Should we have a separate modal for mediaTypes?
})
.onSubmit((result) => {
this._partialUpdate(result);
if (!result.dataType) {
throw new Error('No dataType found on property');
}
this._partialUpdate(result as UmbPropertyTypeModel);
})
.observeRouteBuilder((routeBuilder) => {
this._modalRoute = routeBuilder(null);