merge with develop branch

LieutenantRoger · LieutenantRoger · commit e22eb6e16f16 · 2020-03-11T15:20:11.000+08:00
diff --git a/package.json b/package.json
@@ -22,9 +22,9 @@
   },
   "scripts": {
     "build": "npm run clean && npm run build:dev && npm run build:prod",
-    "build:dev": "NODE_ENV=development ./node_modules/.bin/webpack --env=development --progress --profile --colors --display-optimization-bailout",
+    "build:dev": "./node_modules/.bin/webpack --env=development --progress --profile --colors --display-optimization-bailout",
     "build:dev:watch": "npm run clean && ./node_modules/.bin/webpack --env=development --progress --profile --colors --watch --display-optimization-bailout",
-    "build:prod": "NODE_ENV=production ./node_modules/.bin/webpack --env=production --progress --profile --colors --display-optimization-bailout",
+    "build:prod": "./node_modules/.bin/webpack --env=production --progress --profile --colors --display-optimization-bailout",
     "clean": "rimraf dist",
     "jest": "jest --no-cache --maxWorkers=4 --config config/jest/default.js",
     "lint": "npm run lint:js",
diff --git a/src/actions/lookup.js b/src/actions/lookup.js
@@ -20,8 +20,13 @@ function getSkillTagsInit() {}
  */
 function getSkillTagsDone() {
   const params = {
-    domain: 'SKILLS',
-    status: 'APPROVED',
+    filter: {
+      domain: 'SKILLS',
+      status: 'APPROVED',
+    },
+    limit: {
+      limit: 1000,
+    },
   };
   return getService().getTags(params);
 }
diff --git a/src/services/lookup.js b/src/services/lookup.js
@@ -25,7 +25,7 @@ class LookupService {
    * @return {Promise} Resolves to the tags.
    */
   async getTags(params) {
-    const res = await this.private.api.get(`/tags/?${qs.stringify(params)}`);
+    const res = await this.private.api.get(`/tags/?filter=${encodeURIComponent(qs.stringify(params.filter))}&${qs.stringify(params.limit)}`);
     return getApiResponsePayload(res);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class LookupService {`
`25`	`25`	`* @return {Promise} Resolves to the tags.`
`26`	`26`	`*/`
`27`	`27`	`async getTags(params) {`
`28`		- const res = await this.private.api.get(`/tags/?${qs.stringify(params)}`);
	`28`	+ const res = await this.private.api.get(`/tags/?filter=${encodeURIComponent(qs.stringify(params.filter))}&${qs.stringify(params.limit)}`);
`29`	`29`	`return getApiResponsePayload(res);`
`30`	`30`	`}`
`31`	`31`