Merge pull request #16 from contentstack/bug/orgs-stack-and-entry-fetch

Bug/orgs stack and entry fetch

Author: uttamukkoji

CHANGELOG.md

@@ -1,4 +1,13 @@
 # Changelog
+
+## [v1.2.2](https://github.com/contentstack/contentstack-management-javascript/tree/v1.2.2) (2021-05-26)
+ - Bug Fix
+   - Organization Specific get all Stack: Get Stack for specific organization from org_uid
+   - Resolved: Entry Publish and Update not work after find function
+   - Resolved: Workflow update issue on fetchAll function
+ - Document Update
+   - `update` Entry example code update
+
 ## [v1.2.1](https://github.com/contentstack/contentstack-management-javascript/tree/v1.2.1) (2021-03-19)
  - Bug Fix
    - User get details: Include organization functions for `is_owner` of the organization

lib/contentstack.js

@@ -44,7 +44,7 @@ import httpClient from './core/contentstackHTTPClient.js'
  * import * as contentstack from '@contentstack/management'
  * const client = contentstack.client({ maxRequests: 5 })
  *
- * @prop {boolean=} params.retryOnError - Optional boolean for retry on failuer. Default is true
+ * @prop {boolean=} params.retryOnError - Optional boolean for retry on failure. Default is true
  * @example //Set the `retryOnError` to false
  * import * as contentstack from '@contentstack/management'
  * const client = contentstack.client({ retryOnError: false })
@@ -54,7 +54,7 @@ import httpClient from './core/contentstackHTTPClient.js'
  * import * as contentstack from '@contentstack/management'
  * const client = contentstack.client({ retryLimit: 2 })
  *
- * @prop {number=} params.retryDelay - The number of miliseconds to use for operation retries. Default is 300ms
+ * @prop {number=} params.retryDelay - The number of milliseconds to use for operation retries. Default is 300ms
  * @example //Set the `retryDelay` to 500ms
  * import * as contentstack from '@contentstack/management'
  * const client = contentstack.client({ retryDelay: 500 })
@@ -93,7 +93,7 @@ import httpClient from './core/contentstackHTTPClient.js'
  * const client = contentstack.client({ maxContentLength: 1024 ** 3 })
  *
  * @prop {number=} params.maxBodyLength - Optional maximum body length in bytes (default: 10 MB)
- * @example //Set the `maxContentLength` to 1024 ** 2 * 10 // 10 MB
+ * @example //Set the `maxBodyLength` to 1024 ** 2 * 10 // 10 MB
  * import * as contentstack from '@contentstack/management'
  * const client = contentstack.client({ maxBodyLength: 1024 ** 2 * 10 })
  *

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)
       }
@@ -119,8 +120,15 @@ export const exportObject = ({ http }) => {
 export const query = ({ http, wrapperCollection }) => {
   return function (params = {}) {
     if (this.organization_uid) {
+      if (!params.query) {
+        params.query = {}
+      }
       params.query['org_uid'] = this.organization_uid
     }
+
+    if (this.content_type_uid) {
+      params.content_type_uid = this.content_type_uid
+    }
     return Query(http, this.urlPath, params, this.stackHeaders, wrapperCollection)
   }
 }
@@ -208,6 +216,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/query/index.js

@@ -7,7 +7,12 @@ export default function Query (http, urlPath, param, stackHeaders = null, wrappe
   if (stackHeaders) {
     headers.headers = stackHeaders
   }
+  var contentTypeUid = null
   if (param) {
+    if (param.content_type_uid) {
+      contentTypeUid = param.content_type_uid
+      delete param.content_type_uid
+    }
     headers.params = {
       ...cloneDeep(param)
     }
@@ -34,6 +39,9 @@ export default function Query (http, urlPath, param, stackHeaders = null, wrappe
     try {
       const response = await http.get(urlPath, headers)
       if (response.data) {
+        if (contentTypeUid) {
+          response.data.content_type_uid = contentTypeUid
+        }
         return new ContentstackCollection(response, http, stackHeaders, wrapperCollection)
       } else {
         throw error(response)
@@ -100,6 +108,9 @@ export default function Query (http, urlPath, param, stackHeaders = null, wrappe
     try {
       const response = await http.get(urlPath, limitHeader)
       if (response.data) {
+        if (contentTypeUid) {
+          response.data.content_type_uid = contentTypeUid
+        }
         return new ContentstackCollection(response, http, stackHeaders, wrapperCollection)
       } else {
         throw error(response)

lib/stack/contentType/entry/index.js

@@ -41,7 +41,7 @@ export function Entry (http, data) {
      * .then((entry) => {
      *  entry.title = 'My New Entry'
      *  entry.description = 'Entry description'
-     *  return Entry.update()
+     *  return entry.update()
      * })
      * .then((entry) => console.log(entry))
      *
@@ -54,7 +54,7 @@ export function Entry (http, data) {
      * .then((entry) => {
      *  entry.title = 'My New Entry'
      *  entry.description = 'Entry description'
-     *  return Entry.update({ locale: 'en-at' })
+     *  return entry.update({ locale: 'en-at' })
      * })
      * .then((entry) => console.log(entry))
      *
@@ -152,13 +152,13 @@ export function Entry (http, data) {
      * @example
      * import * as contentstack from '@contentstack/management'
      * const client = contentstack.client()
-     * 
+     *
      * const publishing_rule = {
-     *  "uid": "blt9b9253297f117e84",
-		 *	"action": "publish", //(‘publish’, ‘unpublish’, or ’both’)
-		 *	"status": 1, //(this could be ‘0’ for Approval Requested, ‘1’ for ‘Approval Accepted’, and ‘-1’ for ‘Approval Rejected’),
-		 *	"notify": false,
-		 *	"comment": "Please review this."
+     * "uid": "blt9b9253297f117e84",
+     * "action": "publish" //(‘publish’, ‘unpublish’, or ’both’)
+     * "status": 1, //(this could be ‘0’ for Approval Requested, ‘1’ for ‘Approval Accepted’, and ‘-1’ for ‘Approval Rejected’),
+     * "notify": false,
+     * comment": "Please review this."
      * }
      * client.stack({ api_key: 'api_key'}).contentType('content_type_uid').entry('uid').publishRequest({ publishing_rule, locale: 'en-us'})
      * .then((response) => console.log(response.notice))
@@ -271,7 +271,7 @@ export function Entry (http, data) {
 export function EntryCollection (http, data) {
   const obj = cloneDeep(data.entries) || []
   const entryCollection = obj.map((entry) => {
-    return new Entry(http, { entry: entry, content_type_uid: 'uid', stackHeaders: data.stackHeaders })
+    return new Entry(http, { entry: entry, content_type_uid: data.content_type_uid, stackHeaders: data.stackHeaders })
   })
   return entryCollection
 }

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.