Merge branch 'bug/orgs-stack-and-entry-fetch' into feature/content-branching

Author: uttamukkoji

lib/entity.js

@@ -1,6 +1,7 @@
 import error from './core/contentstackError'
 import cloneDeep from 'lodash/cloneDeep'
 import Query from './query/index'
+import ContentstackCollection from './contentstackCollection'
 
 export const publish = (http, type) => {
   return async function ({ publishDetails, locale = null, version = null, scheduledAt = null }) {
@@ -83,7 +84,7 @@ export const create = ({ http, params }) => {
     try {
       const response = await http.post(this.urlPath, data, headers)
       if (response.data) {
-        return new this.constructor(http, parseData(response, this.stackHeaders))
+        return new this.constructor(http, parseData(response, this.stackHeaders, this.content_type_uid))
       } else {
         throw error(response)
       }
@@ -106,7 +107,7 @@ export const exportObject = ({ http }) => {
     try {
       const response = await http.get(this.urlPath, headers)
       if (response.data) {
-        return new this.constructor(http, parseData(response, this.stackHeaders))
+        return new this.constructor(http, parseData(response, this.stackHeaders, this.content_type_uid))
       } else {
         throw error(response)
       }
@@ -224,6 +225,29 @@ export const fetch = (http, type) => {
     }
   }
 }
+export const fetchAll = (http, wrapperCollection) => {
+  return async function (params = {}) {
+    const headers = {}
+    if (this.stackHeaders) {
+      headers.headers = this.stackHeaders
+    }
+    if (params) {
+      headers.params = {
+        ...cloneDeep(params)
+      }
+    }
+    try {
+      const response = await http.get(this.urlPath, headers)
+      if (response.data) {
+        return new ContentstackCollection(response, http, this.stackHeaders, wrapperCollection)
+      } else {
+        throw error(response)
+      }
+    } catch (err) {
+      throw error(err)
+    }
+  }
+}
 
 export function parseData (response, stackHeaders, contentTypeUID) {
   const data = response.data || {}

lib/organization/index.js

@@ -1,6 +1,6 @@
 import cloneDeep from 'lodash/cloneDeep'
 import error from '../core/contentstackError'
-import { fetch } from '../entity'
+import { fetch, fetchAll } from '../entity'
 import ContentstackCollection from '../contentstackCollection'
 import { RoleCollection } from '../stack/roles'
 import { StackCollection } from '../stack'
@@ -222,25 +222,13 @@ export function Organization (http, data) {
      * .then((collection) => console.log(collection))
      *
      */
-    this.fetchAll = async (parmas) => {
-      try {
-        const response = await http.get(this.urlPath, { params: parmas })
-        if (response.data) {
-          return new ContentstackCollection(response, http, null, OrganizationCollection)
-        } else {
-          throw error(response)
-        }
-      } catch (err) {
-        throw error(err)
-      }
-    }
+    this.fetchAll = fetchAll(http, OrganizationCollection)
   }
 }
 
 export function OrganizationCollection (http, data) {
   const obj = cloneDeep(data.organizations || [])
-  const organizationCollection = obj.map((userdata) => {
+  return obj.map((userdata) => {
     return new Organization(http, { organization: userdata })
   })
-  return organizationCollection
 }

lib/stack/roles/index.js

@@ -1,5 +1,5 @@
 import cloneDeep from 'lodash/cloneDeep'
-import { create, update, deleteEntity, fetch, query } from '../../entity'
+import { create, update, deleteEntity, fetch, query, fetchAll } from '../../entity'
 import ContentstackCollection from '../../contentstackCollection'
 import error from '../../core/contentstackError'
 /**
@@ -133,27 +133,7 @@ export function Role (http, data) {
      * client.stack().role().findAll()
      * .then((collection) => console.log(collection))
      */
-    this.fetchAll = async (params = {}) => {
-      const headers = {}
-      if (this.stackHeaders) {
-        headers.headers = this.stackHeaders
-      }
-      if (params) {
-        headers.params = {
-          ...cloneDeep(params)
-        }
-      }
-      try {
-        const response = await http.get(this.urlPath, headers)
-        if (response.data) {
-          return new ContentstackCollection(response, http, this.stackHeaders, RoleCollection)
-        } else {
-          throw error(response)
-        }
-      } catch (err) {
-        throw error(err)
-      }
-    }
+    this.fetchAll = fetchAll(http, RoleCollection)
 
     /**
      * @description The Query on Role will allow to fetch details of all or specific role.

lib/stack/webhook/index.js

@@ -5,7 +5,8 @@ import {
   deleteEntity,
   fetch,
   upload,
-  parseData
+  parseData,
+  fetchAll
 } from '../../entity'
 import error from '../../core/contentstackError'
 import FormData from 'form-data'
@@ -179,27 +180,7 @@ export function Webhook (http, data = {}) {
      * .then((collection) => console.log(collection))
      *
      */
-    this.fetchAll = async (params) => {
-      const headers = {}
-      if (this.stackHeaders) {
-        headers.headers = this.stackHeaders
-      }
-      if (params) {
-        headers.params = {
-          ...cloneDeep(params)
-        }
-      }
-      try {
-        const response = await http.get(this.urlPath, headers)
-        if (response.data) {
-          return new ContentstackCollection(response, http, null, WebhookCollection)
-        } else {
-          throw error(response)
-        }
-      } catch (err) {
-        throw error(err)
-      }
-    }
+    this.fetchAll = fetchAll(http, WebhookCollection)
   }
 
   /**

lib/stack/workflow/index.js

@@ -3,7 +3,8 @@ import {
   create,
   update,
   deleteEntity,
-  fetch
+  fetch,
+  fetchAll
 } from '../../entity'
 import error from '../../core/contentstackError'
 import ContentstackCollection from '../../contentstackCollection'
@@ -265,27 +266,7 @@ export function Workflow (http, data = {}) {
          * .then((collection) => console.log(collection))
          *
          */
-    this.fetchAll = async (params) => {
-      const headers = {}
-      if (this.stackHeaders) {
-        headers.headers = this.stackHeaders
-      }
-      if (params) {
-        headers.params = {
-          ...cloneDeep(params)
-        }
-      }
-      try {
-        const response = await http.get(this.urlPath, headers)
-        if (response.data) {
-          return new ContentstackCollection(response, http, null, WorkflowCollection)
-        } else {
-          throw error(response)
-        }
-      } catch (err) {
-        throw error(err)
-      }
-    }
+    this.fetchAll = fetchAll(http, WorkflowCollection)
 
     /**
          * @description The Publish rule allow you to create, fetch, delete, update the publish rules.

lib/stack/workflow/publishRules/index.js

@@ -3,10 +3,9 @@ import {
   create,
   update,
   deleteEntity,
-  fetch
+  fetch,
+  fetchAll
 } from '../../../entity'
-import error from '../../../core/contentstackError'
-import ContentstackCollection from '../../../contentstackCollection'
 
 /**
  * PublishRules is a tool that allows you to streamline the process of content creation and publishing, and lets you manage the content lifecycle of your project smoothly. Read more about <a href='https://www.contentstack.com/docs/developers/set-up-publish ruless-and-publish-rules'>PublishRuless and Publish Rules</a>.
@@ -80,17 +79,17 @@ export function PublishRules (http, data = {}) {
      * import * as contentstack from '@contentstack/management'
      * const client = contentstack.client()
      * const publishing_rule = {
-     *    "publish rules": "publish rules_uid",
+     *    	"publish rules": "publish rules_uid",
      *        "actions": [],
      *        "content_types": ["$all"],
      *        "locales": ["en-us"],
      *        "environment": "environment_uid",
-     *        "approvers": {
-     *        "users": ["user_uid"],
-     *        "roles": ["role_uid"]
+     *         "approvers": {
+     *        	"users": ["user_uid"],
+     *        	"roles": ["role_uid"]
      *        },
      *        "publish rules_stage": "publish rules_stage_uid",
-     *        "disable_approver_publishing": false
+     *         "disable_approver_publishing": false
      *    }
      * client.stack().publishRules().create({ publishing_rule })
      * .then((publishRules) => console.log(publishRules))
@@ -102,9 +101,9 @@ export function PublishRules (http, data = {}) {
      * @memberof Publish Rules
      * @func fetchAll
      * @param {String} content_types Enter a comma-separated list of content type UIDs for filtering publish rules on its basis.
-     * @param {Int} limit The limit parameter will return a specific number of Publish Ruless in the output.
-     * @param {Int} skip The skip parameter will skip a specific number of Publish Ruless in the output.
-     * @param {Boolean}include_count To retrieve the count of Publish Ruless.
+     * @param {Int} limit The limit parameter will return a specific number of Publish Rules in the output.
+     * @param {Int} skip The skip parameter will skip a specific number of Publish Rules in the output.
+     * @param {Boolean}include_count To retrieve the count of Publish Rules.
      * @returns {ContentstackCollection} Result collection of content of specified module.
      * @example
      * import * as contentstack from '@contentstack/management'
@@ -114,27 +113,7 @@ export function PublishRules (http, data = {}) {
      * .then((collection) => console.log(collection))
      *
      */
-    this.fetchAll = async (params) => {
-      const headers = {}
-      if (this.stackHeaders) {
-        headers.headers = this.stackHeaders
-      }
-      if (params) {
-        headers.params = {
-          ...cloneDeep(params)
-        }
-      }
-      try {
-        const response = await http.get(this.urlPath, headers)
-        if (response.data) {
-          return new ContentstackCollection(response, http, null, PublishRulesCollection)
-        } else {
-          throw error(response)
-        }
-      } catch (err) {
-        throw error(err)
-      }
-    }
+    this.fetchAll = fetchAll(http, PublishRulesCollection)
   }
 }