chore: add lodash in certain packages

euheny · euheny · commit 548ceb24785c · 2022-06-03T13:57:36.000+03:00
diff --git a/packages/casimir/modules/assets/lib/components/AssetInput/AssetInput.vue b/packages/casimir/modules/assets/lib/components/AssetInput/AssetInput.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-  import { isEqual } from '@deip/toolbox/lodash';
+  import { isEqual } from 'lodash';
 
   const defaultValue = {
     id: null,
@@ -124,8 +124,12 @@
        * Get selected asset
        */
       selectedAsset() {
-        if (this.internalValue.symbol) return this.$store.getters['assets/one'](this.internalValue.symbol);
-        if (this.assetsListKeys.length) return this.$store.getters['assets/one'](this.assetsListKeys[0]);
+        if (this.internalValue.symbol) {
+          return this.$store.getters['assets/one'](this.internalValue.symbol);
+        }
+        if (this.assetsListKeys.length) {
+          return this.$store.getters['assets/one'](this.assetsListKeys[0]);
+        }
         return null;
       },
 
diff --git a/packages/casimir/modules/assets/lib/mixins/assetsMixin.js b/packages/casimir/modules/assets/lib/mixins/assetsMixin.js
@@ -1,7 +1,11 @@
 import currency from 'currency.js';
 
-import { isNil } from '@deip/toolbox/lodash';
-import { isNumber, isObject, isString } from '@deip/toolbox';
+import {
+  isNumber,
+  isObject,
+  isString,
+  isNil
+} from '@deip/toolbox';
 
 export const assetsMixin = {
   methods: {
diff --git a/packages/casimir/modules/assets/package.json b/packages/casimir/modules/assets/package.json
@@ -30,6 +30,7 @@
 		"@deip/vuetify-extended": "1.380.0",
 		"change-case": "^4.1.2",
 		"currency.js": "^2.0.4",
+		"lodash": "^4.17.21",
 		"maska": "^1.4.2"
 	},
 	"peerDependencies": {
diff --git a/packages/casimir/modules/attributes/lib/components/AttributeEdit.jsx b/packages/casimir/modules/attributes/lib/components/AttributeEdit.jsx
@@ -22,7 +22,7 @@ import {
 import { VeRawDisplay, VeStack } from '@deip/vue-elements';
 import { VlsBuilder } from '@deip/vue-layout-schema';
 import { isObject, RecursiveIterator, camelCase } from '@deip/toolbox';
-import { isEqual, cloneDeep } from '@deip/toolbox/lodash';
+import { isEqual, cloneDeep } from 'lodash';
 import draggable from 'vuedraggable';
 
 import {
diff --git a/packages/casimir/modules/attributes/lib/composables/schemaPartials.js b/packages/casimir/modules/attributes/lib/composables/schemaPartials.js
@@ -13,7 +13,7 @@ import {
 
 import { VexDateInput } from '@deip/vuetify-extended';
 
-import { cloneDeep } from '@deip/toolbox/lodash';
+import { cloneDeep } from 'lodash';
 import {
   pascalCase, isObject, RecursiveIterator, camelCase
 } from '@deip/toolbox';
diff --git a/packages/casimir/modules/attributes/lib/mixins/abstractAttribute.js b/packages/casimir/modules/attributes/lib/mixins/abstractAttribute.js
@@ -3,7 +3,7 @@ import {
   isFile,
   wrapInArray
 } from '@deip/toolbox';
-import { isEqual, cloneDeep } from '@deip/toolbox/lodash';
+import { isEqual, cloneDeep } from 'lodash';
 import { ValidationProvider } from '@deip/validation-plugin';
 import { VeStack } from '@deip/vue-elements';
 
diff --git a/packages/casimir/modules/attributes/package.json b/packages/casimir/modules/attributes/package.json
@@ -36,6 +36,7 @@
     "@deip/vuetify-extended": "1.380.0",
     "@vue/babel-preset-jsx": "^1.2.4",
     "dot-prop": "^6.0.1",
+    "lodash": "^4.17.21",
     "qs": "^6.10.3",
     "vue-clamp": "^0.3.2",
     "vuedraggable": "^2.24.3"
diff --git a/packages/casimir/modules/auth/lib/authModule.js b/packages/casimir/modules/auth/lib/authModule.js
@@ -1,7 +1,7 @@
-import { isEmpty, isNil } from '@deip/toolbox/lodash';
+import { isEmpty } from 'lodash';
 import { SYSTEM_ROLE } from '@deip/constants';
 import { AccessService } from '@deip/access-service';
-import { setLocalesMessages, hasValue } from '@deip/toolbox';
+import { setLocalesMessages, hasValue, isNil } from '@deip/toolbox';
 import { awaitForStore, callForCurrentUser } from '@deip/platform-util';
 
 import { hasRoles } from './util/roles';
diff --git a/packages/casimir/modules/auth/lib/util/roles.js b/packages/casimir/modules/auth/lib/util/roles.js
@@ -1,5 +1,5 @@
 import { wrapInArray } from '@deip/toolbox';
-import { intersectionWith } from '@deip/toolbox/lodash';
+import { intersectionWith } from 'lodash';
 
 export const hasRoles = (userRoles, roles) => {
   const rolesList = wrapInArray(roles);
diff --git a/packages/casimir/modules/auth/package.json b/packages/casimir/modules/auth/package.json
@@ -31,7 +31,8 @@
     "@deip/validation-plugin": "1.380.0",
     "@deip/vue-elements": "1.380.0",
     "@deip/vuetify-extended": "1.380.0",
-    "@deip/web-socket-service": "1.380.0"
+    "@deip/web-socket-service": "1.380.0",
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "@deip/users-module": "^1.374.0",
diff --git a/packages/casimir/modules/investment-opportunities/lib/components/crowdfunding/Create/CreateCrowdfundingForm.vue b/packages/casimir/modules/investment-opportunities/lib/components/crowdfunding/Create/CreateCrowdfundingForm.vue
@@ -68,8 +68,7 @@
 
   import { defineComponent } from '@deip/platform-util';
   import { VeStack } from '@deip/vue-elements';
-  import { hasValue } from '@deip/toolbox';
-  import { isNil } from '@deip/toolbox/lodash';
+  import { hasValue, isNil } from '@deip/toolbox';
   import { MIN_TOKEN_UNITS_TO_SELL } from '@deip/constants';
 
   import CrowdfundingTitleInput from './CrowdfundingTitleInput';
diff --git a/packages/casimir/modules/investment-opportunities/lib/components/crowdfunding/Progress/CrowdfundingProgress.vue b/packages/casimir/modules/investment-opportunities/lib/components/crowdfunding/Progress/CrowdfundingProgress.vue
@@ -61,7 +61,7 @@
   import { dateMixin } from '@deip/platform-components';
   import { INVESTMENT_OPPORTUNITY_STATUS } from '@deip/constants';
   import { isString } from '@deip/toolbox';
-  import { uniqBy } from '@deip/toolbox/lodash';
+  import { uniqBy } from 'lodash';
   /**
    * Component for crowdfunding progress
    * @displayName  CrowdfundingProgress
@@ -140,7 +140,9 @@
        * Get bar color depending on investment opportunity status
        */
       barColor() {
-        return this.investmentOpportunity.status === INVESTMENT_OPPORTUNITY_STATUS.EXPIRED ? 'error' : 'success';
+        return this.investmentOpportunity.status === INVESTMENT_OPPORTUNITY_STATUS.EXPIRED
+          ? 'error'
+          : 'success';
       },
       /**
        * Get bar height
diff --git a/packages/casimir/modules/investment-opportunities/lib/components/crowdfunding/Widget/CrowdfundingWidget.vue b/packages/casimir/modules/investment-opportunities/lib/components/crowdfunding/Widget/CrowdfundingWidget.vue
@@ -49,7 +49,7 @@
 <script>
   import { defineComponent } from '@deip/platform-util';
   import { dateMixin } from '@deip/platform-components';
-  import { orderBy } from '@deip/toolbox/lodash';
+  import { orderBy } from 'lodash';
   import { INVESTMENT_OPPORTUNITY_STATUS } from '@deip/constants';
   import { assetsMixin } from '@deip/assets-module';
   import { VeStack } from '@deip/vue-elements';
@@ -211,10 +211,16 @@
        * Get project investment opportunity data
        */
       getProjectInvestmentOpportunityData() {
-        return this.$store.dispatch('investmentOpportunities/getListByProjectId', this.projectId)
+        return this.$store.dispatch(
+          'investmentOpportunities/getListByProjectId',
+          this.projectId
+        )
           .then(() => {
             if (this.investmentOpportunity) {
-              this.$store.dispatch('investmentOpportunities/getInvestmentOpportunityInvestments', this.investmentOpportunity._id);
+              this.$store.dispatch(
+                'investmentOpportunities/getInvestmentOpportunityInvestments',
+                this.investmentOpportunity._id
+              );
             }
           })
           .catch((error) => {
diff --git a/packages/casimir/modules/investment-opportunities/package.json b/packages/casimir/modules/investment-opportunities/package.json
@@ -36,6 +36,7 @@
     "@deip/vue-layout-schema": "1.380.0",
     "@deip/vuetify-extended": "1.380.0",
     "date-fns": "^2.22.1",
+    "lodash": "^4.17.21",
     "maska": "^1.4.2",
     "randomstring": "^1.2.1"
   },
diff --git a/packages/casimir/modules/layouts/lib/helpers/attributedForm.js b/packages/casimir/modules/layouts/lib/helpers/attributedForm.js
@@ -1,4 +1,4 @@
-import { isEqual } from '@deip/toolbox/lodash';
+import { isEqual } from 'lodash';
 
 import {
   attributeMethodsFactory,
diff --git a/packages/casimir/modules/layouts/package.json b/packages/casimir/modules/layouts/package.json
@@ -27,7 +27,8 @@
     "@deip/toolbox": "1.380.0",
     "@deip/vue-editorjs": "1.380.0",
     "@deip/vue-elements": "1.380.0",
-    "@deip/vue-layout-schema": "1.380.0"
+    "@deip/vue-layout-schema": "1.380.0",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@babel/core": "^7.14.6",
diff --git a/packages/casimir/modules/projects/lib/store/index.js b/packages/casimir/modules/projects/lib/store/index.js
@@ -1,4 +1,4 @@
-import { get } from '@deip/toolbox/lodash';
+import { get } from 'lodash';
 
 import { ProjectService } from '@deip/project-service';
 import {
diff --git a/packages/casimir/modules/projects/package.json b/packages/casimir/modules/projects/package.json
@@ -31,7 +31,8 @@
     "@deip/proxydi": "1.380.0",
     "@deip/toolbox": "1.380.0",
     "@deip/vue-elements": "1.380.0",
-    "@deip/vuetify-extended": "1.380.0"
+    "@deip/vuetify-extended": "1.380.0",
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "vuex": "^3.6.2"
diff --git a/packages/casimir/modules/users/lib/mixins/userHelpers.js b/packages/casimir/modules/users/lib/mixins/userHelpers.js
@@ -1,4 +1,4 @@
-import { isEmpty } from '@deip/toolbox/lodash';
+import { isEmpty } from 'lodash';
 
 export const userHelpersMixin = {
   methods: {
diff --git a/packages/casimir/modules/users/package.json b/packages/casimir/modules/users/package.json
@@ -32,7 +32,8 @@
     "@deip/validation-plugin": "1.380.0",
     "@deip/vue-elements": "1.380.0",
     "@deip/vue-layout-schema": "1.380.0",
-    "@deip/vuetify-extended": "1.380.0"
+    "@deip/vuetify-extended": "1.380.0",
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
     "@deip/auth-module": "^1.374.0",
diff --git a/packages/casimir/platform/components/lib/mixins/form.js b/packages/casimir/platform/components/lib/mixins/form.js
@@ -1,4 +1,4 @@
-import { cloneDeep, isEqual } from '@deip/toolbox/lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import { VIEW_MODE } from '@deip/constants';
 
 /**
diff --git a/packages/casimir/platform/components/package.json b/packages/casimir/platform/components/package.json
@@ -26,6 +26,7 @@
     "@deip/vuetify-extended": "1.380.0",
     "change-case": "^4.1.2",
     "date-fns": "^2.22.1",
+    "lodash": "^4.17.21",
     "qs": "^6.10.1"
   },
   "peerDependencies": {
diff --git a/packages/casimir/platform/util/lib/store/watch.js b/packages/casimir/platform/util/lib/store/watch.js
@@ -1,4 +1,4 @@
-import { isNil } from '@deip/toolbox/lodash';
+import { isNil } from '@deip/toolbox';
 
 /**
  * Wait until some value appears in getter
diff --git a/packages/casimir/plugins/VuetifyExtended/lib/components/VexInput/VexTimeInput/VexTimeInput.vue b/packages/casimir/plugins/VuetifyExtended/lib/components/VexInput/VexTimeInput/VexTimeInput.vue
@@ -20,8 +20,6 @@
   import { createRange } from 'vuetify/lib/util/helpers';
   /* eslint-enable */
 
-  import { padStart } from '@deip/toolbox/lodash';
-
   import { VexAutocomplete } from '../../VexAutocomplete';
 
   /**
@@ -31,7 +29,7 @@
    * @returns {string}
    */
   const formatTime = (h, m) => {
-    const addLeadingZero = (s) => padStart(s, 2, '0');
+    const addLeadingZero = (s) => (s).toString().padStart(2, '0');
     return `${addLeadingZero(h)}:${addLeadingZero(m)}`;
   };
 
diff --git a/packages/casimir/plugins/VuetifyExtended/lib/components/VexRichedit/VexRichedit.vue b/packages/casimir/plugins/VuetifyExtended/lib/components/VexRichedit/VexRichedit.vue
@@ -8,7 +8,7 @@
 
   import { defineComponent } from '@deip/platform-util';
   import { VueEditorjs } from '@deip/vue-editorjs';
-  import { isEqual } from '@deip/toolbox/lodash';
+  import { isEqual } from 'lodash';
 
   import { getBindableProps } from '../../composables';
 
diff --git a/packages/casimir/plugins/VuetifyExtended/lib/components/VexTreeview/VexTreeview.vue b/packages/casimir/plugins/VuetifyExtended/lib/components/VexTreeview/VexTreeview.vue
@@ -18,9 +18,9 @@
   /* eslint-disable */
   import { VTreeview } from 'vuetify/lib';
   /* eslint-enable */
-  import { isNil, get, difference } from '@deip/toolbox/lodash';
+  import { isNil, get, difference } from 'lodash';
 
-  import { getBindableProps } from '../../composables/props';
+  import { getBindableProps } from '../../composables';
   /**
    * Component for displaying large amounts of nested data
    */
diff --git a/packages/casimir/plugins/VuetifyExtended/package.json b/packages/casimir/plugins/VuetifyExtended/package.json
@@ -31,6 +31,7 @@
     "date-fns": "^2.22.1",
     "dompurify": "^2.3.0",
     "find-keypath": "^1.0.0",
+    "lodash": "^4.17.21",
     "marked": "^2.1.3",
     "mime": "^2.5.2",
     "parse-path": "^4.0.3",
diff --git a/packages/common/vue-editorjs/lib/editor/vue-editorjs.js b/packages/common/vue-editorjs/lib/editor/vue-editorjs.js
@@ -15,7 +15,7 @@ import Marker from '@editorjs/marker';
 
 // import { mdiAccount } from '@mdi/js';
 
-import { isEqual, debounce } from '@deip/toolbox/lodash';
+import { isEqual, debounce } from 'lodash';
 
 // const genIcon = (path) => `
 //   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" role="img" aria-hidden="true" class="v-icon__svg">
diff --git a/packages/common/vue-editorjs/package.json b/packages/common/vue-editorjs/package.json
@@ -31,7 +31,8 @@
     "@editorjs/table": "^2.0.1",
     "@editorjs/underline": "^1.0.0",
     "@mdi/js": "^5.9.55",
-    "jest-serializer-html": "^7.1.0"
+    "jest-serializer-html": "^7.1.0",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@babel/core": "^7.14.3",
diff --git a/packages/common/vue-layout-schema/lib/builder/components/builder/VlsBuilder.jsx b/packages/common/vue-layout-schema/lib/builder/components/builder/VlsBuilder.jsx
@@ -8,7 +8,7 @@ import {
 // eslint-disable-next-line import/no-unresolved,import/extensions
 } from 'vuetify/lib/components';
 
-import { isEqual } from '@deip/toolbox/lodash';
+import { isEqual } from 'lodash';
 
 import { VlsBuilderContainer } from '../container';
 import { VlsBuilderBlocks } from '../blocks';
diff --git a/packages/common/vue-layout-schema/lib/builder/components/canvas/VlsBuilderCanvas.jsx b/packages/common/vue-layout-schema/lib/builder/components/canvas/VlsBuilderCanvas.jsx
@@ -11,7 +11,7 @@ import { ClickOutside } from 'vuetify/lib/directives';
 import { VeRawDisplay } from '@deip/vue-elements';
 
 import { deepFindParentByValue, paramCase } from '@deip/toolbox';
-import { merge } from '@deip/toolbox/lodash';
+import { merge } from 'lodash';
 import draggable from 'vuedraggable';
 import { BuilderMixin } from '../../mixins';
 
diff --git a/packages/common/vue-layout-schema/lib/builder/components/container/VlsBuilderContainer.jsx b/packages/common/vue-layout-schema/lib/builder/components/container/VlsBuilderContainer.jsx
@@ -1,5 +1,5 @@
 import { uuidv4 } from '@deip/toolbox';
-import { isEqual } from '@deip/toolbox/lodash';
+import { isEqual } from 'lodash';
 
 import { mutations, getters } from '../../store';
 import { normalizeBlocksObject } from '../../utils/helpers';
diff --git a/packages/common/vue-layout-schema/lib/builder/components/settings/VlsBuilderSettings.jsx b/packages/common/vue-layout-schema/lib/builder/components/settings/VlsBuilderSettings.jsx
@@ -5,7 +5,7 @@ import {
   capitalCase, deepFindParentByValue, hasOwnProperty, sentenceCase
 } from '@deip/toolbox';
 
-import { cloneDeep } from '@deip/toolbox/lodash';
+import { cloneDeep } from 'lodash';
 
 import { VeStack } from '@deip/vue-elements';
 
diff --git a/packages/common/vue-layout-schema/lib/builder/mixins/builderMixin.js b/packages/common/vue-layout-schema/lib/builder/mixins/builderMixin.js
@@ -1,7 +1,7 @@
 import {
   cloneDeep,
   isEqual
-} from '@deip/toolbox/lodash';
+} from 'lodash';
 import { getters, mutations } from '../store';
 
 /**
diff --git a/packages/common/vue-layout-schema/lib/builder/utils/helpers.js b/packages/common/vue-layout-schema/lib/builder/utils/helpers.js
@@ -11,7 +11,7 @@ import {
   RecursiveIterator, objectPath, isFunction, assert
 } from '@deip/toolbox';
 
-import { cloneDeep } from '@deip/toolbox/lodash';
+import { cloneDeep } from 'lodash';
 
 import {
   RENDERER_SCHEMA_BLOCK_KEYS,
@@ -116,11 +116,13 @@ export const convertBlockPropsForCanvas = (node) => {
   }
 
   if (proxyProps) {
-    objectPath.set(res, ['data', 'proxyProps'], convertBlockPropsValueForCanvas(Object.keys(proxyProps)
+    const setData = convertBlockPropsValueForCanvas(Object.keys(proxyProps)
       .reduce((acc, component) => ({
         ...acc,
         ...{ [component]: convertBlockPropsValueForCanvas(proxyProps[component]) }
-      }), {})));
+      }), {}));
+
+    objectPath.set(res, ['data', 'proxyProps'], setData);
   }
 
   return res;
diff --git a/packages/common/vue-layout-schema/lib/parser/VlsParser.jsx b/packages/common/vue-layout-schema/lib/parser/VlsParser.jsx
@@ -13,7 +13,7 @@ import {
   TemplateStringParser
 } from '@deip/toolbox';
 
-import { cloneDeep, merge } from '@deip/toolbox/lodash';
+import { cloneDeep, merge } from 'lodash';
 
 /**
  * @typedef {Object} SchemaNode
diff --git a/packages/common/vue-layout-schema/package.json b/packages/common/vue-layout-schema/package.json
@@ -30,6 +30,7 @@
     "@deip/constants": "1.380.0",
     "@deip/toolbox": "1.380.0",
     "@deip/vue-elements": "1.380.0",
+    "lodash": "^4.17.21",
     "vuedraggable": "^2.24.3"
   },
   "peerDependencies": {
