@agility/content-sync 1.0.4 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agility/content-sync",
-  "version": "1.0.4",
+  "version": "1.1.2",
   "description": "JavaScript SDK for synchronizing content from Agility CMS",
   "main": "dist/agility-sync-sdk.node.js",
   "scripts": {

package/src/methods/syncContent.js

@@ -12,11 +12,12 @@ export default async function (languageCode, token) {
 	let itemCount = 0
 	let busy = false
 	let waitMS = 0
-	const waitMaxMS = 30000
-	const waitIntervalMS = 500
+	const waitMaxMS = 60000
+	const waitIntervalMS = 1000
 
 	do {
 
+
 		//sync content items...
 		const syncRet = await this.agilityClient.getSyncContent({
 			syncToken: token,
@@ -25,8 +26,8 @@ export default async function (languageCode, token) {
 
 		});
 
-		if (syncRet.busy !== undefined
-			&& syncRet.busy === true) {
+
+		if (syncRet === undefined || syncRet === null || (syncRet.busy !== undefined && syncRet.busy === true)) {
 			//if the api is being updated, wait a few ms and try again...
 			waitMS += waitIntervalMS
 			if (waitMS > waitMaxMS) {

package/src/methods/syncPages.js

@@ -8,8 +8,8 @@ export default async function (languageCode, token) {
 
 	let busy = false
 	let waitMS = 0
-	const waitMaxMS = 30000
-	const waitIntervalMS = 500
+	const waitMaxMS = 60000
+	const waitIntervalMS = 1000
 
 
 	do {
@@ -20,8 +20,7 @@ export default async function (languageCode, token) {
 			languageCode: languageCode
 		});
 
-		if (syncRet.busy !== undefined
-			&& syncRet.busy === true) {
+		if (syncRet === undefined || syncRet === null || (syncRet.busy !== undefined && syncRet.busy === true)) {
 			//if the api is being updated, wait a few ms and try again...
 			waitMS += waitIntervalMS
 			if (waitMS > waitMaxMS) {

package/src/store-interface.js

@@ -220,7 +220,14 @@ const getSyncState = async (languageCode) => {
  * @param {boolean} [requestParams.expandAllContentLinks] - Whether or not to expand entire linked content references, includings lists and items that are rendered in the CMS as Grid or Link. Default is **false**
  * @returns {Promise<Object>} - Returns a content item object.
 */
-const getContentItem = async ({ contentID, languageCode, depth = 2, expandAllContentLinks = false }) => {
+const getContentItem = async ({ contentID, languageCode, depth, contentLinkDepth, expandAllContentLinks = false }) => {
+
+	if (depth === undefined && contentLinkDepth !== undefined) {
+		depth = contentLinkDepth
+	} else if (depth === undefined && contentLinkDepth === undefined) {
+		depth = 2
+	}
+
 	const contentItem = await store.getItem({
 		options,
 		itemType: "item",
@@ -250,33 +257,92 @@ const expandContentItem = async ({ contentItem, languageCode, depth, expandAllCo
 					depth: depth - 1,
 				});
 				if (childItem != null) fields[fieldName] = childItem;
-			} else if (fieldValue.sortids && fieldValue.sortids.split) {
-				//multi linked item
-				const sortIDAry = fieldValue.sortids.split(",");
+			} else if (fieldValue.fulllist === true
+							&& fieldValue.referencename
+							&& expandAllContentLinks === true) {
+
+				//LINK TO THE FULL LIST
+				const referenceName = fieldValue.referencename
+
+				const skip = 0
+				const take = 50
+
+				const list = await getContentList({
+					referenceName,
+					languageCode,
+					depth: depth - 1,
+					expandAllContentLinks,
+					skip,
+					take
+				})
+
+				let sortIDAry = []
+
+				if (fieldValue.sortids && fieldValue.sortids.split) {
+					sortIDAry = fieldValue.sortids.split(",");
+				}
+
+				let itemCount = 0
 				const childItems = [];
 				for (const childItemID of sortIDAry) {
+					itemCount++
 					const childItem = await getContentItem({
 						contentID: childItemID,
 						languageCode,
 						depth: depth - 1,
+						expandAllContentLinks,
+						skip,
+						take
+					});
+
+					if (childItem != null) {
+						childItems.push(childItem);
+					}
+				}
+
+				for (const listItem of list.items) {
+					itemCount++
+					if (itemCount > 50) break;
+
+					const listItemContentID = listItem.contentID
+					if (sortIDAry.includes(`${listItemContentID}`)) {
+						continue;
+					}
+
+					const childItem = await getContentItem({
+						contentID: listItemContentID,
+						languageCode,
+						depth: depth - 1,
 						expandAllContentLinks
 					});
 					if (childItem != null) childItems.push(childItem);
 				}
+
 				fields[fieldName] = childItems;
-			} else if (fieldValue.referencename
-				&& expandAllContentLinks === true) {
-					//if we are expanding ALL content links...
 
-					const childList = await getContentList({
-						referenceName: fieldValue.referencename,
+			} else if (fieldValue.sortids && fieldValue.sortids.split && fieldValue.fulllist !== true) {
+				//MULTI LINKED ITEM
+				let sortIDAry = []
+				if (fieldValue.sortids && fieldValue.sortids.split) {
+					sortIDAry = fieldValue.sortids.split(",");
+				}
+
+				const skip = expandAllContentLinks ? 0 : undefined
+				const take = expandAllContentLinks ? 50 : undefined
+
+				const childItems = [];
+				for (const childItemID of sortIDAry) {
+					const childItem = await getContentItem({
+						contentID: childItemID,
 						languageCode,
 						depth: depth - 1,
 						expandAllContentLinks,
-						take: 50
-					})
-
-					fields[fieldName] = childList
+						skip,
+						take
+					});
+					if (childItem != null) childItems.push(childItem);
+				}
+				fields[fieldName] = childItems;
 
 			}
 		}
@@ -357,7 +423,14 @@ const getContentList = async ({ referenceName, languageCode, depth = 0, expandAl
  * @param {*} { pageID, languageCode, depth = 3 }
  * @returns
  */
-const getPage = async ({ pageID, languageCode, depth = 3 }) => {
+const getPage = async ({ pageID, languageCode, depth, contentLinkDepth, expandAllContentLinks = false }) => {
+
+	if (depth === undefined && contentLinkDepth !== undefined) {
+		depth = contentLinkDepth
+	} else if (depth === undefined && contentLinkDepth === undefined) {
+		depth = 2
+	}
+
 	let pageItem = await store.getItem({
 		options,
 		itemType: "page",
@@ -376,6 +449,7 @@ const getPage = async ({ pageID, languageCode, depth = 3 }) => {
 					contentID: mod.item.contentid,
 					languageCode,
 					depth: depth - 1,
+					expandAllContentLinks
 				});
 				mod.item = moduleItem;
 			}

package/src/sync-client.js

@@ -9,7 +9,7 @@ import storeInterfaceFileSystem from './store-interface-filesystem'
 
 function getSyncClient (userConfig) {
     validateConfigParams(userConfig);
-    return createSyncCient(userConfig);
+    return createSyncClient(userConfig);
 }
 
 function validateConfigParams(configParams) {
@@ -39,11 +39,11 @@ const defaultConfig = {
     }
 };
 
-function createSyncCient(userConfig) {
+function createSyncClient(userConfig) {
     let config = {
         ...defaultConfig,
         ...userConfig
-        
+
     }
 
     const agilityClient = agility.getApi({
@@ -60,7 +60,7 @@ function createSyncCient(userConfig) {
 
     //set the sync storage interface provider, it will also validate it
     storeInterface.setStore(store, config.store.options);
-    
+
     return {
         config,
         agilityClient,

package/test/04-store.getContentList.tests.js

@@ -42,5 +42,26 @@ describe('store.getContentList:', async function() {
 		assert.strictEqual(contentList.items.length, 1,  'retrieved only the item of the content list we asked for')
 
     })
+
+
+    it('should be able to expand a nested list with expandAllContentLinks', async function () {
+        var syncClient = createSyncClient();
+
+        const contentList = await syncClient.store.getContentList({
+            referenceName: 'listwithnestedcontentlink',
+            languageCode: languageCode,
+            depth: 10,
+            take: 50,
+            skip: 0,
+            expandAllContentLinks: true
+        })
+
+        assert.isAtLeast(contentList.totalCount, 1, 'retrieved the totalCount of the content list we asked for')
+        assert.exists(contentList.items, 'retrieved the items of the content list we asked for')
+        assert.exists(contentList.items[0].fields, 'retrieved the item of the content list we asked for')
+        assert.isAtLeast(contentList.items[0].fields.posts.length, 1, 'expanded the linked cotnent of the posts field')
+
+
+    })
 });
 

package/test/_syncClients.config.js

@@ -15,7 +15,8 @@ function createSyncClient() {
         apiKey: apiKeyFetch,
         isPreview: false,
         channels: [ 'website'],
-		languages: ['en-us']
+        languages: ['en-us'],
+        baseUrl: "https://api-dev.aglty.io"
 	});
 
     return syncClient;
@@ -31,7 +32,8 @@ function createSyncClientUsingConsoleStore() {
         store: {
             interface: storeInterfaceConsole,
             options: {}
-        }
+        },
+        baseUrl: "https://api-dev.aglty.io"
     });
     return syncClient;
 }
@@ -43,7 +45,8 @@ function createPreviewSyncClient() {
         apiKey: apiKeyPreview,
         isPreview: true,
         channels: [ 'website'],
-        languages: ['en-us']
+        languages: ['en-us'],
+        baseUrl: "https://api-dev.aglty.io"
     });
     return syncClient;
 }