@nascentdigital/funnel-cms 4.4.10 → 4.4.14

package/dist/api/PageClient.d.ts

@@ -121,14 +121,6 @@ export declare namespace PageClient {
         }
         export {};
     }
-    type Update = {
-        id: Schema.Page.Id;
-        slug?: string;
-        publication?: number | null;
-        errors: boolean;
-        updatedOn: number;
-        updates: ReadonlyArray<Schema.Page.Update>;
-    };
     namespace GetOverview {
         type Args = Query.ByBrandAndRegion;
         type Result = {
@@ -207,8 +199,19 @@ export declare namespace PageClient {
         type Result = Schema.Page.Data.AsLink;
     }
     namespace Update {
-        type Args = Update;
-        type Result = Schema.Page.Data;
+        type Args = {
+            id: Schema.Page.Id;
+            slug?: string;
+            publication?: number | null;
+            errors: boolean;
+            updatedOn: number;
+            updates: ReadonlyArray<Schema.Page.Update>;
+        };
+        type Result = {
+            updatedOn: number;
+            changeSetId: Schema.ChangeSet.Id;
+            page?: Schema.Page.Data;
+        };
     }
     namespace Replace {
         type Args = {

package/dist/strapi/StrapiPageClient.js

@@ -617,92 +617,11 @@ class StrapiPageClient {
         return serialization_1.PageData.deserializeRef(updatedData);
     }
     async update(args) {
-        // TODO: migrating towards this as the new method for ALL updates in the future
-        if (args.updates.length === 1 && args.updates[0].type === 'section.blockName') {
-            // publish changeset (transactional)
-            const data = await this.provider.customRequest({
-                command: 'page/update',
-                method: 'POST',
-                data: JSON.stringify(args)
-            });
-            console.debug('[StrapiPageClient/update] custom update result: ', data);
-        }
-        // resolve current user (or throw)
-        const { id: pageId, slug: pageSlug, publication: pagePublication, errors, updates } = args;
-        const { client, users } = this.provider;
-        const strapiUrl = client.baseURL;
-        const user = await users.me();
-        if (!user) {
-            throw new funnel_core_1.NotAuthenticatedError();
-        }
-        // get latest version of page
-        const collection = client.collection('pages');
-        const resultProps = funnel_core_1.Schema.Page.Data.Props.all;
-        const { data: currentData } = await collection.findOne(pageId, {
-            status: 'draft',
-            populate: serialization_1.PageData.Populate.full
-        });
-        // TODO: validate page is able to be updated (e.g. not archived, etc.)
-        // throw if page doesn't exist
-        if (!currentData) {
-            throw new funnel_core_1.NotFoundError();
-        }
-        // deserialize page (we'll be updating this version)
-        let page = serialization_1.PageData.deserialize(currentData, strapiUrl, resultProps);
-        // update slug
-        if (pageSlug && page.slug) {
-            console.debug(`[StrapiPageClient/update] updating page slug from "${page.slug}" to ${pageSlug}`);
-            // validate slug before updating
-            const validateSlugResult = await this.validateSlug({
-                brand: page.brand,
-                type: page.type,
-                region: page.region,
-                groupId: page.groupId,
-                slug: pageSlug
-            });
-            if (validateSlugResult.status !== 'available') {
-                throw new errors_1.SlugValidationError({ slug: pageSlug, reason: validateSlugResult });
-            }
-            page.slug = pageSlug;
-        }
-        // update publication
-        if (pagePublication !== undefined) {
-            page.publication = pagePublication !== null && pagePublication !== void 0 ? pagePublication : -1;
-        }
-        // set errors
-        page.errors = errors;
-        console.debug(`[StrapiPageClient/update] applying ${updates.length} page updates`);
-        // merge changes (the original page will have changed)
-        const model = funnel_core_1.Schema.PageModel.from(page);
-        model.update(updates);
-        console.debug(`[StrapiPageClient/update] saving updated page`);
-        // resolve change set (rebind)
-        const { provider } = this;
-        const changeSet = await provider.changeSets.resolve({ id: page.changeSetId, fallbackToGlobal: true });
-        page.changeSetId = changeSet.id;
-        // save page
-        const update = serialization_1.PageData.serialize(page);
-        const { data: updatedData } = await collection.update(page.id, Object.assign(Object.assign({}, update), { state: 'draft' }), {
-            status: 'draft',
-            populate: serialization_1.PageData.Populate.full
-        });
-        page = serialization_1.PageData.deserialize(updatedData, strapiUrl, resultProps);
-        // update changeset
-        changeSet.addPageChange(user.id, {
-            __type: 'page',
-            id: page.id,
-            name: page.name,
-            schema: page.type,
-            region: page.region,
-            language: page.language,
-            slug: page.slug,
-            type: page.publishedOn ? 'update' : 'create',
-            errors: page.errors
+        return this.provider.customRequest({
+            command: 'page/update',
+            method: 'POST',
+            data: JSON.stringify(args)
         });
-        provider.changeSets.update(changeSet.toData())
-            .catch(console.error);
-        // return page
-        return page;
     }
     async replace({ page, version, skipSync = false }) {
         console.debug(`[StrapiPageClient/replace] replacing page`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nascentdigital/funnel-cms",
-  "version": "4.4.10",
+  "version": "4.4.14",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/cms"
@@ -41,5 +41,5 @@
     "ts-jest": "^29",
     "type-fest": "^4"
   },
-  "gitHead": "3aa36fa46c32ad625f569ea4b9e43aab80937ff4"
+  "gitHead": "242a9e0979c03d4037eb2462c5b01b2a095e8e8f"
 }