@nascentdigital/funnel-cms 4.4.17 → 4.4.19

package/dist/api/CollectionClient.d.ts

@@ -91,7 +91,7 @@ export declare namespace CollectionClient {
     }
     type Update = {
         id: Schema.Collection.Id;
-        errors: boolean;
+        updatedOn: number;
         updates: ReadonlyArray<Schema.Collection.Update>;
     };
     namespace Replace {
@@ -159,7 +159,11 @@ export declare namespace CollectionClient {
     }
     namespace Update {
         type Args = Update;
-        type Result = Schema.Collection.Data;
+        type Result = {
+            updatedOn: number;
+            changeSetId: Schema.ChangeSet.Id;
+            collection?: Schema.Collection.Data;
+        };
     }
     namespace Unpublish {
         type Args = Schema.Collection.Id;

package/dist/strapi/IStrapiContentClient.d.ts

@@ -30,7 +30,7 @@ export declare namespace IStrapiContentClient {
         method?: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
         onError?: Callback<TError>;
     };
-    type CustomCommand = 'changeset/query' | 'changeset/commit' | 'changeset/revert' | 'page/update' | 'query/pages' | 'query/rank-pages' | 'query/collections' | 'query/collection' | 'publish' | 'unpublish' | 'version';
+    type CustomCommand = 'changeset/query' | 'changeset/commit' | 'changeset/revert' | 'page/update' | 'collection/update' | 'query/pages' | 'query/rank-pages' | 'query/collections' | 'query/collection' | 'publish' | 'unpublish' | 'version';
     type UnpublishErrorData = Jsonify<{
         error: true;
         pageRefs: PageData.Ref[];

package/dist/strapi/StrapiCollectionClient.d.ts

@@ -10,7 +10,7 @@ export declare class StrapiCollectionClient implements CollectionClient {
     get({ version, id }: CollectionClient.Get.Args): Promise<CollectionClient.Get.Result>;
     create(args: CollectionClient.Create.Args): Promise<CollectionClient.Create.Result>;
     duplicate({ source: collectionId, targetCollection, targetLanguage }: CollectionClient.Duplicate.Args): Promise<CollectionClient.Duplicate.Result>;
-    update({ id: collectionId, errors, updates }: CollectionClient.Update.Args): Promise<CollectionClient.Update.Result>;
+    update(args: CollectionClient.Update.Args): Promise<CollectionClient.Update.Result>;
     replace({ updatedCollection, version, skipSync }: CollectionClient.Replace.Args): Promise<CollectionClient.Replace.Result>;
     unpublish(collectionId: CollectionClient.Unpublish.Args): Promise<CollectionClient.Unpublish.Result>;
     getDependants({ id: collectionId, version }: CollectionClient.GetDependants.Args): Promise<CollectionClient.GetDependants.Result>;

package/dist/strapi/StrapiCollectionClient.js

@@ -397,61 +397,12 @@ class StrapiCollectionClient {
             throw funnel_core_1.IsometricErrorUtils.coerceError(e);
         }
     }
-    async update({ id: collectionId, errors, updates }) {
-        // resolve current user (or throw)
-        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 collection
-        const entries = client.collection('collections');
-        const resultProps = funnel_core_1.Schema.Collection.Data.Props.all;
-        const { data: currentData } = await entries.findOne(collectionId, {
-            status: 'draft',
-            populate: serialization_1.CollectionData.populate
-        });
-        // TODO: validate collection is able to be updated (e.g. not archived, etc.)
-        // TODO: switch to isometric error so we can catch it on client-side
-        // throw if collection doesn't exist
-        if (!currentData) {
-            throw new funnel_core_1.NotFoundError();
-        }
-        // deserialize collection (we'll be updating this version)
-        const collection = serialization_1.CollectionData.deserialize(currentData, strapiUrl, resultProps);
-        // set errors
-        collection.errors = errors;
-        console.debug(`[StrapiPageClient/update] applying ${updates.length} collection updates`);
-        // merge changes (the original collection will have changed)
-        const model = funnel_core_1.Schema.CollectionModel.from(collection);
-        model.update(updates);
-        console.debug(`[StrapiPageClient/update] saving updated collection`);
-        // resolve change set (rebind)
-        const { provider } = this;
-        const changeSet = await provider.changeSets.resolve({ id: collection.changeSetId, fallbackToGlobal: true });
-        collection.changeSetId = changeSet.id;
-        // save collection
-        const update = serialization_1.CollectionData.serialize(collection);
-        const { data: updatedData } = await entries.update(collection.id, Object.assign(Object.assign({}, update), { state: 'draft' }), {
-            status: 'draft',
-            populate: serialization_1.CollectionData.populate
-        });
-        // update changeset
-        changeSet.addCollectionChange(user.id, {
-            __type: 'collection',
-            id: collection.id,
-            groupId: collection.groupId,
-            name: collection.name,
-            schema: collection.type,
-            language: collection.language,
-            type: collection.publishedOn ? 'update' : 'create',
-            errors: collection.errors
+    async update(args) {
+        return this.provider.customRequest({
+            command: 'collection/update',
+            method: 'POST',
+            data: JSON.stringify(args)
         });
-        provider.changeSets.update(changeSet.toData())
-            .catch(console.error);
-        // return collection
-        return serialization_1.CollectionData.deserialize(updatedData, strapiUrl, resultProps);
     }
     async replace({ updatedCollection, version, skipSync }) {
         console.debug(`[StrapiCollectionClient/replace] replacing collection`);

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@nascentdigital/funnel-cms",
-  "version": "4.4.17",
+  "version": "4.4.19",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/cms"
   },
   "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,5 +42,5 @@
     "ts-jest": "^29",
     "type-fest": "^4"
   },
-  "gitHead": "f343d2af0dff3dd7e8ae12a9ab83bceb93381ec2"
+  "gitHead": "d4ab7346c7b2e39897e5eb6be0a64e2f0278d51b"
 }