@umbraco-cms/backoffice 14.0.0--preview004-8fc4facc → 14.0.0--preview004-64d63c8e

package/dist-cms/packages/core/variant/variant-id.class.d.ts

@@ -14,6 +14,8 @@ export declare class UmbVariantId {
     toString(): string;
     toCultureString(): string;
     toSegmentString(): string;
+    isCultureInvariant(): boolean;
+    isSegmentInvariant(): boolean;
     isInvariant(): boolean;
     toObject(): variantObject;
     toDifferencesString(variantId: UmbVariantId): string;

package/dist-cms/packages/core/variant/variant-id.class.js

@@ -27,6 +27,12 @@ export class UmbVariantId {
     toSegmentString() {
         return this.segment || '';
     }
+    isCultureInvariant() {
+        return this.culture === null;
+    }
+    isSegmentInvariant() {
+        return this.segment === null;
+    }
     isInvariant() {
         return this.culture === null && this.segment === null;
     }

package/dist-cms/packages/documents/documents/repository/document.repository.d.ts

@@ -46,9 +46,6 @@ export declare class UmbDocumentRepository extends UmbBaseController implements
     trash(id: string): Promise<{
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
-    saveAndPublish(id: string, item: UpdateDocumentRequestModel, variantIds: Array<UmbVariantId>): Promise<{
-        error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
-    }>;
     publish(id: string, variantIds: Array<UmbVariantId>): Promise<{
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;

package/dist-cms/packages/documents/documents/repository/document.repository.js

@@ -159,28 +159,13 @@ export class UmbDocumentRepository extends UmbBaseController {
         }
         return { error };
     }
-    async saveAndPublish(id, item, variantIds) {
-        if (!id)
-            throw new Error('id is missing');
-        if (!variantIds)
-            throw new Error('variant IDs are missing');
-        //await this.#init;
-        await this.save(id, item);
-        const { error } = await this.#detailDataSource.saveAndPublish(id, variantIds);
-        if (!error) {
-            // TODO: Update other stores based on above effect.
-            const notification = { data: { message: `Document saved and published` } };
-            this.#notificationContext?.peek('positive', notification);
-        }
-        return { error };
-    }
     async publish(id, variantIds) {
         if (!id)
             throw new Error('id is missing');
         if (!variantIds)
             throw new Error('variant IDs are missing');
         await this.#init;
-        const { error } = await this.#detailDataSource.saveAndPublish(id, variantIds);
+        const { error } = await this.#detailDataSource.publish(id, variantIds);
         if (!error) {
             // TODO: Update other stores based on above effect.
             const notification = { data: { message: `Document published` } };

package/dist-cms/packages/documents/documents/repository/sources/document.server.data.d.ts

@@ -53,7 +53,7 @@ export declare class UmbDocumentServerDataSource implements UmbDataSource<Create
      * @return {*}
      * @memberof UmbDocumentServerDataSource
      */
-    saveAndPublish(id: string, variantIds: Array<UmbVariantId>): Promise<import("../../../../core/repository/index.js").DataSourceResponse<any>>;
+    publish(id: string, variantIds: Array<UmbVariantId>): Promise<import("../../../../core/repository/index.js").DataSourceResponse<any>>;
     /**
      * Unpublish one or more variants of a Document
      * @param {string} id

package/dist-cms/packages/documents/documents/repository/sources/document.server.data.js

@@ -100,12 +100,14 @@ export class UmbDocumentServerDataSource {
      * @return {*}
      * @memberof UmbDocumentServerDataSource
      */
-    async saveAndPublish(id, variantIds) {
+    async publish(id, variantIds) {
         if (!id)
             throw new Error('Id is missing');
         // TODO: THIS DOES NOT TAKE SEGMENTS INTO ACCOUNT!!!!!!
         const requestBody = {
-            cultures: variantIds.map((variant) => variant.toCultureString()),
+            cultures: variantIds
+                .map((variant) => (variant.isCultureInvariant() ? null : variant.toCultureString()))
+                .filter((x) => x !== null),
         };
         return tryExecuteAndNotify(this.#host, DocumentResource.putDocumentByIdPublish({ id, requestBody }));
     }

package/dist-cms/packages/documents/documents/workspace/actions/save-and-publish.action.js

@@ -11,6 +11,6 @@ export class UmbDocumentSaveAndPublishWorkspaceAction extends UmbWorkspaceAction
         //const document = this.workspaceContext.getData();
         // TODO: handle errors
         //if (!document) return;
-        this.workspaceContext.publish();
+        this.workspaceContext.saveAndPublish();
     }
 }

package/dist-cms/packages/documents/documents/workspace/document-workspace.context.d.ts

@@ -41,8 +41,8 @@ export declare class UmbDocumentWorkspaceContext extends UmbEditableWorkspaceCon
     setPropertyValue<PropertyValueType = unknown>(alias: string, value: PropertyValueType, variantId?: UmbVariantId): Promise<void>;
     save(): Promise<void>;
     delete(): Promise<void>;
-    publish(): Promise<void>;
     saveAndPublish(): Promise<void>;
+    publish(): Promise<void>;
     unpublish(): Promise<void>;
     createVariantContext(host: UmbControllerHost, variantId: UmbVariantId): UmbDocumentVariantContext;
     destroy(): void;

package/dist-cms/packages/documents/documents/workspace/document-workspace.context.js

@@ -134,11 +134,9 @@ export class UmbDocumentWorkspaceContext extends UmbEditableWorkspaceContextBase
             this.#currentData.update({ values });
         }
     }
-    async save() {
-        if (!this.#currentData.value)
-            return;
-        if (!this.#currentData.value.id)
-            return;
+    async #createOrSave() {
+        if (!this.#currentData.value?.id)
+            throw new Error('Id is missing');
         if (this.getIsNew()) {
             // TODO: typescript hack until we get the create type
             const value = this.#currentData.value;
@@ -149,6 +147,9 @@ export class UmbDocumentWorkspaceContext extends UmbEditableWorkspaceContextBase
         else {
             await this.repository.save(this.#currentData.value.id, this.#currentData.value);
         }
+    }
+    async save() {
+        await this.#createOrSave();
         this.saveComplete(this.getData());
     }
     async delete() {
@@ -157,25 +158,26 @@ export class UmbDocumentWorkspaceContext extends UmbEditableWorkspaceContextBase
             await this.repository.delete(id);
         }
     }
-    async publish() {
-        // TODO: This might be right to publish all, but we need a method that just publishes a declared range of variants.
+    async saveAndPublish() {
+        await this.#createOrSave();
+        // TODO: This might be right to publish all, but we need a method that just saves and publishes a declared range of variants.
         const currentData = this.#currentData.value;
         if (currentData) {
             const variantIds = currentData.variants?.map((x) => UmbVariantId.Create(x));
-            const id = this.getEntityId();
+            const id = currentData.id;
             if (variantIds && id) {
                 await this.repository.publish(id, variantIds);
             }
         }
     }
-    async saveAndPublish() {
-        // TODO: This might be right to publish all, but we need a method that just saves and publishes a declared range of variants.
+    async publish() {
+        // TODO: This might be right to publish all, but we need a method that just publishes a declared range of variants.
         const currentData = this.#currentData.value;
         if (currentData) {
             const variantIds = currentData.variants?.map((x) => UmbVariantId.Create(x));
-            const id = currentData.id;
+            const id = this.getEntityId();
             if (variantIds && id) {
-                await this.repository.saveAndPublish(id, currentData, variantIds);
+                await this.repository.publish(id, variantIds);
             }
         }
     }