storyblok 3.16.0 → 3.17.0

package/README.md

@@ -3,8 +3,6 @@
   <p align="center">A simple CLI for scaffolding <a href="https://www.storyblok.com" target="_blank">Storyblok</a> projects and fieldtypes.</p>
 </p>
 
-You found an issue?<br>Tell us about it - <a href="https://github.com/storyblok/storyblok/issues/new">open an issue</a> or look if it was <a href="https://github.com/storyblok/storyblok/issues/">already reported</a>.
-
 [![npm](https://img.shields.io/npm/v/storyblok.svg)](https://www.npmjs.com/package/storyblok)
 [![npm](https://img.shields.io/npm/dt/storyblok.svg)](ttps://img.shields.io/npm/dt/storyblok.svg)
 [![GitHub issues](https://img.shields.io/github/issues/storyblok/storyblok.svg?style=flat-square&v=1)](https://github.com/storyblok/storyblok/issues?q=is%3Aopen+is%3Aissue)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storyblok",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "description": "A simple CLI to start Storyblok from your command line.",
   "repository": {
     "type": "git",

package/src/cli.js

@@ -435,8 +435,9 @@ program
       if (!api.isAuthorized()) {
         await api.processLogin()
       }
+      const { region } = creds.get()
 
-      await tasks.listSpaces(api)
+      await tasks.listSpaces(api, region)
     } catch (e) {
       console.log(chalk.red('X') + ' An error ocurred to listing spaces: ' + e.message)
       process.exit(1)

package/src/tasks/list-spaces.js

@@ -1,35 +1,64 @@
 const chalk = require('chalk')
-
 /**
  * @method listSpaces
  * @param api - Pass the api instance as a parameter
  * @return {Promise}
  */
 
-const listSpaces = async (api) => {
+const listSpaces = async (api, currentRegion) => {
+  const isChinaEnv = currentRegion === 'cn'
+  const regionOptions = {
+    eu: 'Europe',
+    us: 'United States'
+  }
   console.log()
   console.log(chalk.green('✓') + ' Loading spaces...')
-  console.log()
 
   if (!api) {
     console.log(chalk.red('X') + 'Api instance is required to make the request')
     return []
   }
 
-  const spaces = await api.getAllSpaces()
-    .then(res => res)
-    .catch(err => Promise.reject(err))
+  if (isChinaEnv) {
+    const spaces = await api.getAllSpacesByRegion(currentRegion)
+      .then(res => res)
+      .catch(err => Promise.reject(err))
 
-  if (!spaces) {
-    console.log(chalk.red('X') + ' No spaces were found for this user ')
-    return []
-  }
-
-  spaces.map(space => {
-    console.log(`${space.name} (id: ${space.id})`)
-  })
+    if (!spaces) {
+      console.log(chalk.red('X') + ' No spaces were found for this user ')
+      return []
+    }
+    console.log(chalk.blue(' -') + ' Spaces From China region:')
 
-  return spaces
+    spaces.map(space => {
+      console.log(`    ${space.name} (id: ${space.id})`)
+    })
+    return spaces
+  } else {
+    const spacesList = []
+    for (const key in regionOptions) {
+      spacesList.push(await api.getAllSpacesByRegion(key)
+        .then((res) => {
+          return {
+            key,
+            res
+          }
+        })
+        .catch(err => Promise.reject(err)))
+    }
+    if (!spacesList) {
+      console.log(chalk.red('X') + ' No spaces were found for this user ')
+      return []
+    }
+    spacesList.forEach(region => {
+      console.log()
+      console.log(`${chalk.blue(' -')} Spaces From ${regionOptions[region.key]} region:`)
+      region.res.forEach((space) => {
+        console.log(`    ${space.name} (id: ${space.id})`)
+      })
+    })
+    return spacesList
+  }
 }
 
 module.exports = listSpaces

package/src/tasks/sync-commands/component-groups.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk')
-const StoryblokClient = require('storyblok-js-client')
 const { findByProperty } = require('../../utils')
+const api = require('../../utils/api')
 
 class SyncComponentGroups {
   /**
@@ -14,9 +14,7 @@ class SyncComponentGroups {
     this.sourceComponentGroups = []
     this.targetComponentGroups = []
 
-    this.client = new StoryblokClient({
-      oauthToken: options.oauthToken
-    })
+    this.client = api.getClient()
   }
 
   async init () {

package/src/tasks/sync-commands/components.js

@@ -1,9 +1,9 @@
 const chalk = require('chalk')
-const StoryblokClient = require('storyblok-js-client')
 const { find } = require('lodash')
 const SyncComponentGroups = require('./component-groups')
 const { findByProperty } = require('../../utils')
 const PresetsLib = require('../../utils/presets-lib')
+const api = require('../../utils/api')
 
 class SyncComponents {
   /**
@@ -16,9 +16,7 @@ class SyncComponents {
     this.sourceSpaceId = options.sourceSpaceId
     this.targetSpaceId = options.targetSpaceId
     this.oauthToken = options.oauthToken
-    this.client = new StoryblokClient({
-      oauthToken: options.oauthToken
-    })
+    this.client = api.getClient()
     this.presetsLib = new PresetsLib({ oauthToken: options.oauthToken, targetSpaceId: this.targetSpaceId })
   }
 

package/src/utils/api.js

@@ -240,8 +240,13 @@ module.exports = {
     return client[method](_path, props)
   },
 
-  async getAllSpaces () {
-    return await this.getClient()
+  async getAllSpacesByRegion (region) {
+    const customClient = new Storyblok({
+      accessToken: this.accessToken,
+      oauthToken: this.oauthToken,
+      region
+    }, this.apiSwitcher(region))
+    return await customClient
       .get('spaces/', {})
       .then(res => res.data.spaces || [])
       .catch(err => Promise.reject(err))

package/src/utils/presets-lib.js

@@ -1,8 +1,8 @@
 const chalk = require('chalk')
-const StoryblokClient = require('storyblok-js-client')
 const FormData = require('form-data')
 const axios = require('axios')
 const { last } = require('lodash')
+const api = require('./api')
 
 class PresetsLib {
   /**
@@ -10,9 +10,7 @@ class PresetsLib {
    */
   constructor (options) {
     this.oauthToken = options.oauthToken
-    this.client = new StoryblokClient({
-      oauthToken: options.oauthToken
-    })
+    this.client = api.getClient()
     this.targetSpaceId = options.targetSpaceId
   }
 

package/tests/units/list-spaces.spec.js

@@ -1,6 +1,12 @@
 const { listSpaces } = require('../../src/tasks/')
 const { FAKE_SPACES } = require('../constants')
 
+const REGION_FLAGS = {
+  UNITED_STATES: 'us',
+  EUROPE: 'eu',
+  CHINA: 'cn'
+}
+
 describe('Test spaces method', () => {
   it('Testing list-spaces funtion without api instance', async () => {
     try {
@@ -10,13 +16,34 @@ describe('Test spaces method', () => {
       console.error(e)
     }
   })
-  it('Testing list-spaces funtion with api instance', async () => {
+
+  it('Testing list-spaces function for China region', async () => {
     const FAKE_API = {
-      getAllSpaces: jest.fn(() => Promise.resolve(FAKE_SPACES()))
+      getAllSpacesByRegion: jest.fn(() => Promise.resolve(FAKE_SPACES()))
     }
     expect(
-      await listSpaces(FAKE_API)
+      await listSpaces(FAKE_API, REGION_FLAGS.CHINA)
     ).toEqual(FAKE_SPACES())
-    expect(FAKE_API.getAllSpaces).toHaveBeenCalled()
+    expect(FAKE_API.getAllSpacesByRegion).toHaveBeenCalled()
+  })
+
+  it('Testing list-spaces funtion for Europe and United States regions', async () => {
+    const FAKE_API = {
+      getAllSpacesByRegion: jest.fn(() => Promise.resolve(FAKE_SPACES()))
+    }
+    const response = [
+      {
+        key: REGION_FLAGS.EUROPE,
+        res: [...FAKE_SPACES()]
+      },
+      {
+        key: REGION_FLAGS.UNITED_STATES,
+        res: [...FAKE_SPACES()]
+      }
+    ]
+
+    expect(
+      await listSpaces(FAKE_API, REGION_FLAGS.EUROPE)
+    ).toEqual(response)
   })
 })

package/.travis.yml

@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - 14
-after_success:
-  - npx semantic-release