Merge pull request #601 from derpdead/release/v1.0.0-beta.5

Release/v1.0.0 beta.5

.storybook/main.js

@@ -2,58 +2,61 @@
  * Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
  * See LICENSE for license details.
  */
-const path = require("path");
+
+const path = require('path');
 
 module.exports = {
-    presets: ['@storybook/addon-docs/preset'],
-    stories: ['../stories/**/*.stories.(js|mdx)'],
-    addons: [
-        '@storybook/addon-actions',
-        '@storybook/addon-links',
-        '@storybook/addon-knobs',
+    "stories": [
+        "../stories/**/*.stories.mdx",
+        "../stories/**/*.stories.@(js|jsx|ts|tsx)"
+    ],
+    "addons": [
+        "@storybook/addon-links",
+        "@storybook/addon-essentials"
     ],
-    webpack: async config => {
+
+    webpackFinal: async (config) => {
         config.resolve.alias = {
             ...config.resolve.alias,
-            ['@Core']: path.resolve(__dirname, '../modules/@ergonode/core/src'),
+            '@Core': path.resolve(__dirname, '../modules/@ergonode/core/src'),
+            '@UI': path.resolve(__dirname, '../modules/@ergonode/ui/src'),
         };
 
         config.module.rules.push({
             test: /\.scss$/,
-            loaders: [
+            use: [
                 'style-loader',
                 'css-loader',
                 'sass-loader',
                 {
                     loader: 'sass-resources-loader',
                     options: {
-                        resources: path.resolve(__dirname, '../modules/@ergonode/core/src/assets/scss/main.scss')
-                    }
-                }],
+                        resources: path.resolve(__dirname, '../modules/@ergonode/ui/src/assets/scss/main.scss'),
+                    },
+                },
+            ],
             include: path.resolve(__dirname, '../'),
         });
 
-        const mdxRules = config.module.rules.filter(({ test }) => {
-            return String(test) === String(/\.mdx$/) || String(test) === String(/\.(stories|story).mdx$/)
-        });
-        mdxRules.forEach(mdxRule => {
-            const [babelLoader] = mdxRule.use.filter(({ loader }) => loader === 'babel-loader');
-            babelLoader.options.presets = babelLoader.options.presets.filter(preset => !preset.includes('babel-preset-vue'))
-        });
-
         config.module.rules.push({
             test: /\.(mjs|jsx?)$/,
-            use: [{
-                loader: 'babel-loader',
-                options: {
-                    cacheDirectory: path.resolve(__dirname, '../node_modules/.cache/storybook'),
-                    presets: ['@vue/app'],
-                    babelrc: false
-                }
-            }],
-            exclude: [path.resolve(__dirname, '../node_modules')]
+            use: [
+                {
+                    loader: 'babel-loader',
+                    options: {
+                        cacheDirectory: path.resolve(__dirname, '../node_modules/.cache/storybook'),
+                        presets: [
+                            '@vue/app',
+                        ],
+                        babelrc: false,
+                    },
+                },
+            ],
+            exclude: [
+                path.resolve(__dirname, '../node_modules'),
+            ],
         });
 
-        return config
+        return config;
     },
-};
+}

.storybook/preview.js

@@ -2,19 +2,20 @@
  * Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
  * See LICENSE for license details.
  */
+
 import '!style-loader!css-loader!sass-loader!./reset-storybook.scss';
-import { DocsPage, DocsContainer } from '@storybook/addon-docs/blocks';
-import {addDecorator, addParameters} from '@storybook/vue';
 
-addDecorator(story => {
+import {
+    addDecorator,
+} from '@storybook/vue';
+
+addDecorator((story) => {
     document.body.classList.add('app');
     document.body.style.position = 'relative';
     return story();
-})
-addParameters({
-    docs: {
-        container: DocsContainer,
-        page: DocsPage,
-        inlineStories: true,
-    },
 });
+
+export const parameters = {
+    actions: { argTypesRegex: "^on[A-Z].*" },
+    controls: { expanded: true },
+}

CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.5](https://github.com/derpdead/frontend/compare/v1.0.0-beta.3...v1.0.0-beta.5) (2020-11-30)
+
+**Note:** Version bump only for package ergonode-front
+
+
+
+
+
+## CHANGELOG FOR v1.0.0-beta.5
+- feature [#596](https://github.com/ergonode/frontend/pull/596) Migrate storybook from v5 to v6 (derpdead)
+- feature [#597](https://github.com/ergonode/frontend/pull/597) Add refresh token support (derpdead)
+- perf [#595](https://github.com/ergonode/frontend/pull/595) Isolated actions along with buttons, improved routing names (derpdead)
+- perf [#598](https://github.com/ergonode/frontend/pull/598) Dropdown improvement (derpdead)
+- bugfix [#599](https://github.com/ergonode/frontend/pull/599) Grid memory leaks (derpdead)
+
 ## CHANGELOG FOR v1.0.0-beta.4
 - feature - add DOM virtualization to select kind components
 - feature - add github actions

cypress/integration/1_attribute/1_addAttributeGroup/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/1_attribute/2_addAttribute/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/2_category/1_addCategory/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/2_category/2_addCategoryTree/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/3_template/1_addTemplate/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/4_segmant/1_addSegment/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/5_collection/1_addCollection/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/6_status/1_addStatus/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/integration/7_settings/1_addUnit/index.test.js

@@ -24,7 +24,7 @@ before(() => {
 });
 
 beforeEach(() => {
-    Cypress.Cookies.preserveOnce('jwt');
+    Cypress.Cookies.preserveOnce('token');
     cy.apiRequest({
         method: 'POST',
         url,

cypress/models/requests.js

@@ -23,7 +23,7 @@ export const removeRequest = ({
 }) => {
     const fullPath = `${Cypress.env('defaultLanguage')}/${path}/${responseID}`;
 
-    cy.getCookie('jwt')
+    cy.getCookie('token')
         .should('exist')
         .then((c) => {
             const token = c.value;

lerna.json

@@ -14,5 +14,5 @@
       "message": "chore(release): %s"
     }
   },
-  "version": "1.0.0-beta.3"
+  "version": "1.0.0-beta.5"
 }

modules/@ergonode/activity-logs/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.5](https://github.com/ergonode/frontend/compare/v1.0.0-beta.3...v1.0.0-beta.5) (2020-11-30)
+
+**Note:** Version bump only for package @ergonode/activity-logs
+
+
+
+
+
 
 
 **Note:** Version bump only for package @ergonode/activity-logs

modules/@ergonode/activity-logs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ergonode/activity-logs",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "author": "Team Ergonode <[email protected]>",
   "description": "Ergonode activity logs module",
   "license": "OSL-3.0",

modules/@ergonode/activity-logs/src/components/Tabs/UsersActivityLogsGridTab.vue

@@ -11,11 +11,7 @@
                 :rows="rows"
                 :filters="filterValues"
                 :pagination="pagination"
-                :extended-columns="extendedColumns"
-                :extended-data-cells="extendedDataCells"
-                :extended-data-filter-cells="extendedDataFilterCells"
-                :extended-data-edit-cells="extendedDataEditCells"
-                :extended-edit-filter-cells="extendedDataEditFilterCells"
+                :extended-components="extendedGridComponents"
                 :is-prefetching-data="isPrefetchingData"
                 :is-basic-filter="true"
                 :is-border="true"

modules/@ergonode/activity-logs/src/config/routes.js

@@ -9,13 +9,18 @@ import {
 } from './imports';
 import Privileges from './privileges';
 
+export const ROUTE_NAME = {
+    ACTIVITY_LOGS: 'activity-logs',
+    ACTIVITY_LOGS_GRID: 'activity-logs-grid',
+};
+
 export default [
     {
-        name: 'activity-logs',
+        name: ROUTE_NAME.ACTIVITY_LOGS,
         path: '/activity-logs',
         component: Pages.UsersActivityLogs,
         redirect: {
-            name: 'activity-logs-grid',
+            name: ROUTE_NAME.ACTIVITY_LOGS_GRID,
         },
         meta: {
             access: true,
@@ -34,7 +39,7 @@ export default [
         },
         children: [
             {
-                name: 'activity-logs-grid',
+                name: ROUTE_NAME.ACTIVITY_LOGS_GRID,
                 path: 'grid',
                 component: Tabs.UsersActivityLogsGridTab,
                 meta: {

modules/@ergonode/activity-logs/src/locales/en_GB.json

@@ -0,0 +1,7 @@
+{
+    "activityLogs": {
+        "page": {
+            "title": "Users activity logs"
+        }
+    }
+}

modules/@ergonode/activity-logs/src/pages/activity-logs/index.vue

@@ -5,8 +5,8 @@
 <template>
     <Page>
         <TitleBar
-            title="Users activity logs"
-            :is-read-only="$isReadOnly('USER')" />
+            :title="$t('activityLogs.page.title')"
+            :is-read-only="isReadOnly" />
         <HorizontalRoutingTabBar
             v-if="asyncTabs"
             :items="asyncTabs" />
@@ -19,6 +19,7 @@ import asyncTabsMixin from '@Core/mixins/tab/asyncTabsMixin';
 import Page from '@UI/components/Layout/Page';
 import HorizontalRoutingTabBar from '@UI/components/TabBar/Routing/HorizontalRoutingTabBar';
 import TitleBar from '@UI/components/TitleBar/TitleBar';
+import PRIVILEGES from '@Users/config/privileges';
 
 export default {
     name: 'UsersTabs',
@@ -31,5 +32,10 @@ export default {
         beforeLeavePageMixin,
         asyncTabsMixin,
     ],
+    computed: {
+        isReadOnly() {
+            return this.$isReadOnly(PRIVILEGES.USER.namespace);
+        },
+    },
 };
 </script>

modules/@ergonode/attributes/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.5](https://github.com/ergonode/frontend/compare/v1.0.0-beta.3...v1.0.0-beta.5) (2020-11-30)
+
+**Note:** Version bump only for package @ergonode/attributes
+
+
+
+
+
 
 
 **Note:** Version bump only for package @ergonode/attributes

modules/@ergonode/attributes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ergonode/attributes",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "author": "Team Ergonode <[email protected]>",
   "description": "Ergonode attributes module",
   "license": "OSL-3.0",