Performance/vuems integration (ergonode#629)

* performance(core): isolation all mechanism to modules * performance(microservices): add support for local middlewares * performance(microservices): Change global methods from VueMS, move elements from skeleton to modules * package change
ciocca-dev · Jan 4, 2021 · 53b9ada · 53b9ada
1 parent e75fe48
commit 53b9ada
Show file tree

Hide file tree

Showing 54 changed files with 320 additions and 306 deletions.
diff --git a/layouts/default.vue b/layouts/default.vue
@@ -10,25 +10,17 @@
 
 <script>
 import DefaultLayout from '@Core/layouts/default';
+import {
+    defaultLayoutMiddleware,
+} from '@Core/middleware/layouts';
 
 export default {
     name: 'NuxtDefaultLayout',
     components: {
         DefaultLayout,
     },
-    async middleware({
-        store,
-        redirect,
-    }) {
-        const {
-            authentication,
-        } = store.state;
-
-        if (!authentication.isLogged) {
-            return redirect('/');
-        }
-
-        return null;
+    async middleware(ctx) {
+        await defaultLayoutMiddleware(ctx);
     },
 };
 </script>
diff --git a/layouts/login.vue b/layouts/login.vue
@@ -10,19 +10,17 @@
 
 <script>
 import LoginLayout from '@Core/layouts/login';
+import {
+    loginLayoutMiddleware,
+} from '@Core/middleware/layouts';
 
 export default {
     name: 'NuxtLoginLayout',
     components: {
         LoginLayout,
     },
-    middleware({
-        store, redirect,
-    }) {
-        if (store.state.authentication.isLogged) {
-            return redirect('/dashboard');
-        }
-        return null;
+    middleware(ctx) {
+        loginLayoutMiddleware(ctx);
     },
 };
 </script>
diff --git a/lib/index-info.js b/lib/index-info.js
@@ -0,0 +1,36 @@
+#!/usr/bin/env node
+/*
+ * Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
+ * See LICENSE for license details.
+ */
+const chalk = require('chalk');
+const envinfo = require('envinfo');
+
+const showEnvInfo = async () => {
+    console.log(chalk.bold('\nEnvironment Info:'));
+    const result = await envinfo
+        .run({
+            System: [
+                'OS',
+                'CPU',
+                'Memory',
+            ],
+            Binaries: [
+                'Node',
+                'Yarn',
+                'npm',
+            ],
+            Browsers: [
+                'Chrome',
+                'Edge',
+                'Firefox',
+                'Safari',
+            ],
+            npmGlobalPackages: [
+                'nuxt',
+            ],
+        });
+    console.log(result);
+};
+
+showEnvInfo();
diff --git a/lib/index.js b/lib/index.js
@@ -21,6 +21,7 @@ program
     .command('env', 'Creat .env file', {
         isDefault: true,
     })
+    .command('info', 'Show environment info')
     .command('modules', 'Modules configuration')
     .command('modules-all', 'All modules configuration')
     .parse(process.argv); // allow commander to parse `process.argv`

diff --git a/middleware/modulesMiddlewareLoader.js b/middleware/modulesMiddlewareLoader.js
@@ -2,8 +2,8 @@
  * Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
  * See LICENSE for license details.
  */
-import middlewareModules from '~/.nuxt/middleware.modules';
+import modulesMiddlewares from '~/.nuxt/middleware.modules';
 
 export default (ctx) => {
-    middlewareModules(ctx);
+    modulesMiddlewares(ctx);
 };
diff --git a/modules/@ergonode/attributes/src/pages/attribute-groups/_group/_id.vue b/modules/@ergonode/attributes/src/pages/attribute-groups/_group/_id.vue
@@ -83,7 +83,7 @@ export default {
             'code',
         ]),
         extendedMainAction() {
-            return this.$getExtendedComponents('@Attributes/pages/attribute-groups/_group/mainAction');
+            return this.$getExtendSlot('@Attributes/pages/attribute-groups/_group/mainAction');
         },
         isReadOnly() {
             return this.$isReadOnly(PRIVILEGES.ATTRIBUTE_GROUP.namespace);

diff --git a/modules/@ergonode/attributes/src/pages/attribute-groups/index.vue b/modules/@ergonode/attributes/src/pages/attribute-groups/index.vue
@@ -54,10 +54,10 @@ export default {
     ],
     computed: {
         extendedMainAction() {
-            return this.$getExtendedComponents('@Attributes/pages/attribute-groups/mainAction');
+            return this.$getExtendSlot('@Attributes/pages/attribute-groups/mainAction');
         },
         extendedModals() {
-            return this.$getExtendedComponents('@Attributes/pages/attribute-groups/injectModal');
+            return this.$getExtendSlot('@Attributes/pages/attribute-groups/injectModal');
         },
         isReadOnly() {
             return this.$isReadOnly(

diff --git a/modules/@ergonode/attributes/src/pages/attributes/_attribute/_id.vue b/modules/@ergonode/attributes/src/pages/attributes/_attribute/_id.vue
@@ -103,7 +103,7 @@ export default {
             'attrTypes',
         ]),
         extendedMainAction() {
-            return this.$getExtendedComponents('@Attributes/pages/attributes/_attribute/mainAction');
+            return this.$getExtendSlot('@Attributes/pages/attributes/_attribute/mainAction');
         },
         isReadOnly() {
             return this.$isReadOnly(PRIVILEGES.ATTRIBUTE.namespace);
@@ -119,7 +119,7 @@ export default {
                     route: this.$route,
                 });
                 const type = getKeyByValue(this.attrTypes, this.type);
-                const tabs = await this.$extendMethods('@Core/pages/tabs', {
+                const tabs = await this.$getExtendMethod('@Core/pages/tabs', {
                     $this: this,
                     type,
                     tabs: tmpTabs,

diff --git a/modules/@ergonode/attributes/src/pages/attributes/index.vue b/modules/@ergonode/attributes/src/pages/attributes/index.vue
@@ -54,10 +54,10 @@ export default {
     ],
     computed: {
         extendedMainAction() {
-            return this.$getExtendedComponents('@Attributes/pages/attributes/mainAction');
+            return this.$getExtendSlot('@Attributes/pages/attributes/mainAction');
         },
         extendedModals() {
-            return this.$getExtendedComponents('@Attributes/pages/attributes/injectModal');
+            return this.$getExtendSlot('@Attributes/pages/attributes/injectModal');
         },
         isReadOnly() {
             return this.$isReadOnly(

diff --git a/modules/@ergonode/attributes/src/store/attribute/actions.js b/modules/@ergonode/attributes/src/store/attribute/actions.js
@@ -48,7 +48,7 @@ export default {
             };
 
             // EXTENDED BEFORE METHOD
-            const extendedData = await this.$extendMethods('@Attributes/store/attribute/action/createAttribute/__before', {
+            const extendedData = await this.$getExtendMethod('@Attributes/store/attribute/action/createAttribute/__before', {
                 $this: this,
                 type: typeKey,
                 data,
@@ -70,7 +70,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attribute/action/createAttribute/__after', {
+            await this.$getExtendMethod('@Attributes/store/attribute/action/createAttribute/__after', {
                 $this: this,
                 type: typeKey,
                 data: {
@@ -147,7 +147,7 @@ export default {
 
         try {
             // EXTENDED BEFORE METHOD
-            await this.$extendMethods('@Attributes/store/attribute/action/getAttribute/__before', {
+            await this.$getExtendMethod('@Attributes/store/attribute/action/getAttribute/__before', {
                 $this: this,
                 data: {
                     id,
@@ -198,7 +198,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attribute/action/getAttribute/__after', {
+            await this.$getExtendMethod('@Attributes/store/attribute/action/getAttribute/__after', {
                 $this: this,
                 data,
                 type,
@@ -247,7 +247,7 @@ export default {
             };
 
             // EXTENDED BEFORE METHOD
-            const extendedData = await this.$extendMethods('@Attributes/store/attribute/action/updateAttribute/__before', {
+            const extendedData = await this.$getExtendMethod('@Attributes/store/attribute/action/updateAttribute/__before', {
                 $this: this,
                 type: typeKey,
                 data: {
@@ -271,7 +271,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attribute/action/updateAttribute/__after', {
+            await this.$getExtendMethod('@Attributes/store/attribute/action/updateAttribute/__after', {
                 $this: this,
                 type: typeKey,
                 data,
@@ -313,7 +313,7 @@ export default {
 
         try {
             // EXTENDED BEFORE METHOD
-            await this.$extendMethods('@Attributes/store/attribute/action/removeAttribute/__before', {
+            await this.$getExtendMethod('@Attributes/store/attribute/action/removeAttribute/__before', {
                 $this: this,
                 type: typeKey,
             });
@@ -325,7 +325,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attribute/action/removeAttribute/__after', {
+            await this.$getExtendMethod('@Attributes/store/attribute/action/removeAttribute/__after', {
                 $this: this,
                 type: typeKey,
             });

diff --git a/modules/@ergonode/attributes/src/store/attributeGroup/actions.js b/modules/@ergonode/attributes/src/store/attributeGroup/actions.js
@@ -30,7 +30,7 @@ export default {
             };
 
             // EXTENDED BEFORE METHOD
-            const extendedData = await this.$extendMethods('@Attributes/store/attributeGroup/action/createAttributeGroup/__before', {
+            const extendedData = await this.$getExtendMethod('@Attributes/store/attributeGroup/action/createAttributeGroup/__before', {
                 $this: this,
                 data,
             });
@@ -50,7 +50,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attributeGroup/action/createAttributeGroup/__after', {
+            await this.$getExtendMethod('@Attributes/store/attributeGroup/action/createAttributeGroup/__after', {
                 $this: this,
                 data: {
                     id,
@@ -88,7 +88,7 @@ export default {
     ) {
         try {
             // EXTENDED BEFORE METHOD
-            await this.$extendMethods('@Attributes/store/attributeGroup/action/getAttributeGroup/__before', {
+            await this.$getExtendMethod('@Attributes/store/attributeGroup/action/getAttributeGroup/__before', {
                 $this: this,
                 data: {
                     id,
@@ -127,7 +127,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attributeGroup/action/getAttributeGroup/__after', {
+            await this.$getExtendMethod('@Attributes/store/attributeGroup/action/getAttributeGroup/__after', {
                 $this: this,
                 data,
             });
@@ -164,7 +164,7 @@ export default {
                 name,
             };
             // EXTENDED BEFORE METHOD
-            const extendedData = await this.$extendMethods('@Attributes/store/attributeGroup/action/updateAttributeGroup/__before', {
+            const extendedData = await this.$getExtendMethod('@Attributes/store/attributeGroup/action/updateAttributeGroup/__before', {
                 $this: this,
                 data: {
                     id,
@@ -186,7 +186,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attributeGroup/action/updateAttributeGroup/__after', {
+            await this.$getExtendMethod('@Attributes/store/attributeGroup/action/updateAttributeGroup/__after', {
                 $this: this,
                 data,
             });
@@ -221,7 +221,7 @@ export default {
             } = state;
 
             // EXTENDED BEFORE METHOD
-            await this.$extendMethods('@Attributes/store/attributeGroup/action/removeAttributeGroup/__before', {
+            await this.$getExtendMethod('@Attributes/store/attributeGroup/action/removeAttributeGroup/__before', {
                 $this: this,
                 data: {
                     id,
@@ -235,7 +235,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Attributes/store/attributeGroup/action/removeAttributeGroup/__after', {
+            await this.$getExtendMethod('@Attributes/store/attributeGroup/action/removeAttributeGroup/__after', {
                 $this: this,
             });
             // EXTENDED AFTER METHOD

diff --git a/modules/@ergonode/authentication/src/store/authentication/actions.js b/modules/@ergonode/authentication/src/store/authentication/actions.js
@@ -97,7 +97,7 @@ export default {
     }) {
         try {
             // EXTENDED BEFORE METHOD
-            await this.$extendMethods('@Authentication/store/authentication/action/getUser/__before', {
+            await this.$getExtendMethod('@Authentication/store/authentication/action/getUser/__before', {
                 $this: this,
             });
             // EXTENDED BEFORE METHOD
@@ -118,7 +118,7 @@ export default {
             });
 
             // EXTENDED AFTER METHOD
-            await this.$extendMethods('@Authentication/store/authentication/action/getUser/__after', {
+            await this.$getExtendMethod('@Authentication/store/authentication/action/getUser/__after', {
                 $this: this,
                 data: transformedUserData,
             });

diff --git a/modules/@ergonode/categories/src/components/Selects/CategorySelect.vue b/modules/@ergonode/categories/src/components/Selects/CategorySelect.vue
@@ -355,7 +355,7 @@ export default {
             ];
         },
         extendedFilterComponents() {
-            return this.$getExtendedComponents('@UI/components/AdvancedFilters/Type');
+            return this.$getExtendSlot('@UI/components/AdvancedFilters/Type');
         },
         selectedTreeCategoryIds() {
             if (!this.isCategoryTreeSelected) {