@nascentdigital/funnel-cms 5.0.1 → 5.0.3

package/dist/contentful/server.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./api/ContentfulApi"), exports);

package/dist/models/Pagination.d.ts

@@ -17,4 +17,5 @@ export declare namespace Pagination {
         pageCount: number;
         totalItemCount: number;
     };
+    type Counts = Omit<Paginated<any>, 'items'>;
 }

package/dist/strapi/StrapiPageClient.js

@@ -150,12 +150,12 @@ class StrapiPageClient {
     async getGroup({ brand, groupId, type, slug, region, language, version, select }) {
         // create base result
         const result = {
-            group: { groupId: groupId !== null && groupId !== void 0 ? groupId : funnel_core_1.Schema.Page.GroupId.empty, brand, type, slug, region, instances: [] }
+            group: { groupId: groupId !== null && groupId !== void 0 ? groupId : funnel_core_1.Schema.Page.GroupId.empty, brand, type, slug, instances: [] }
         };
         // fetch baseline page (fail if it doesn't exist)
         const client = this.provider.client;
         const collection = client.collection('pages');
-        const { items: baselineItems = [] } = await Strapi_1.Strapi.paginate(Object.assign({ collection, pagination: 'all', fields: serialization_1.PageData.getStrapiFilter(funnel_core_1.Schema.Page.Data.Props.id) }, getPageQueryParams({ version, brand, groupId, type, slug, region })));
+        const { items: baselineItems = [] } = await Strapi_1.Strapi.paginate(Object.assign({ collection, pagination: 'all', fields: serialization_1.PageData.getStrapiFilter(funnel_core_1.Schema.Page.Data.Props.id) }, getPageQueryParams({ version, brand, groupId, type, slug })));
         const [baselinePage] = baselineItems;
         if (!baselinePage) {
             return result;
@@ -172,7 +172,7 @@ class StrapiPageClient {
             const instance = serialization_1.PageData.deserializeLegacy(item, client.baseURL, funnel_core_1.Schema.Page.Data.AsGroup.Instance.props);
             group.instances.push(instance);
             // set page if language matches
-            if (instance.language === language) {
+            if (instance.region === region && instance.language === language) {
                 result.page = await this.get({ id: instance.id, version, select });
             }
         }
@@ -239,13 +239,14 @@ class StrapiPageClient {
                 throw new funnel_core_1.ArgumentError(`Page group "${args.groupId}" no longer exists in "${args.brand}"`);
             }
             // return existing page if it's there
-            let existingPage = existingPages.find(existing => existing.language === args.language);
+            let existingPage = existingPages
+                .find(existing => existing.region === args.region && existing.language === args.language);
             if (existingPage) {
                 return this.getGroup(Object.assign(Object.assign({}, existingPage), { version: 'draft' }));
             }
             // bind data + update url
             existingPage = existingPages[0];
-            const draft = funnel_core_1.Schema.PageModel.fromDraft(Object.assign({ type: existingPage.type, slug: existingPage.slug, url: existingPage.url, region: existingPage.region, name: existingPage.name, tags: existingPage.tags }, args));
+            const draft = funnel_core_1.Schema.PageModel.fromDraft(Object.assign({ type: existingPage.type, slug: existingPage.slug, url: existingPage.url, name: existingPage.name, tags: existingPage.tags }, args));
             draft.sync();
             // resolve change set (rebind)
             const { provider } = this;
@@ -290,13 +291,13 @@ class StrapiPageClient {
                         groupId: page.groupId,
                         brand: page.brand,
                         type: page.type,
-                        region: page.region,
                         slug: page.slug,
                         instances: [
-                            ...existingPages.map(({ id, url, language, name, slug, tags, state, errors, createdOn, updatedOn, publishedOn }) => ({ id, url, language, name, slug, tags, state, errors, createdOn, updatedOn, publishedOn })),
+                            ...existingPages.map(({ id, url, region, language, name, slug, tags, state, errors, createdOn, updatedOn, publishedOn }) => ({ id, url, region, language, name, slug, tags, state, errors, createdOn, updatedOn, publishedOn })),
                             {
                                 id: page.id,
                                 url: page.url,
+                                region: page.region,
                                 language: page.language,
                                 name: page.name,
                                 slug: page.slug,
@@ -345,8 +346,8 @@ class StrapiPageClient {
                 brand: args.brand,
                 type: args.type,
                 region: args.region,
-                slug: args.slug,
-                language: args.language
+                language: args.language,
+                slug: args.slug
             });
             // return existing page if it's there
             if (existingPage) {
@@ -400,13 +401,13 @@ class StrapiPageClient {
                         groupId: page.groupId,
                         brand: page.brand,
                         type: page.type,
-                        region: args.region,
                         slug: page.slug,
                         instances: [
                             ...existingGroup.instances,
                             {
                                 id: page.id,
                                 url: page.url,
+                                region: args.region,
                                 language: page.language,
                                 name: page.name,
                                 slug: page.slug,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nascentdigital/funnel-cms",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/cms"
@@ -14,6 +14,8 @@
   "exports": {
     ".": "./dist/index.js",
     "./strapi": "./dist/strapi/index.js",
+    "./contentful": "./dist/contentful/index.js",
+    "./contentful/server": "./dist/contentful/server.js",
     "./strapi/client": "./dist/strapi/client.js"
   },
   "files": [
@@ -33,14 +35,18 @@
     "next": "^15"
   },
   "dependencies": {
+    "@contentful/app-sdk": "^4",
     "@slack/webhook": "^7",
+    "contentful": "^11",
+    "contentful-management": "^12",
     "lexorank": "^1",
-    "qs": "^6"
+    "qs": "^6",
+    "uuid": "^11"
   },
   "devDependencies": {
     "jest": "^29",
     "ts-jest": "^29",
     "type-fest": "^4"
   },
-  "gitHead": "6ac66e04e5d6d10b959826b84cf3827422ddf47b"
+  "gitHead": "0d1cc7d78504e8819998d928ffb342d622f75690"
 }