Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #632 from ergonode/release/v1.0.0-beta.7
Browse files Browse the repository at this point in the history
Release/v1.0.0 beta.7
  • Loading branch information
bleto authored Jan 11, 2021
2 parents e461721 + 0457661 commit cbf8689
Show file tree
Hide file tree
Showing 404 changed files with 13,038 additions and 8,486 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ module.exports = {
},
],
'func-names': 'off',
'simple-import-sort/sort': 'error',
'simple-import-sort/imports': 'error',
'import/order': 'error',
'import/no-mutable-exports': 'error',
'import/first': 'error',
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## CHANGELOG FOR v1.0.0-beta.7

- feature [#623](https://github.com/ergonode/frontend/pull/623) Remove drafts (derpdead)
- feature [#624](https://github.com/ergonode/frontend/pull/624) Add support for routing query params (derpdead)
- feature [#625](https://github.com/ergonode/frontend/pull/625) Sidebar DOM virtualization (derpdead)
- performance [#629](https://github.com/ergonode/frontend/pull/629) Performance / vuems integration (bleto)
- bugfix [#626](https://github.com/ergonode/frontend/pull/626) Enabling sorting based on localParams (derpdead)
- bugfix [#627](https://github.com/ergonode/frontend/pull/627) Add additional validation for fetching user avatar (derpdead)
- bugfix [#630](https://github.com/ergonode/frontend/pull/630) RTE empty paragraph, grid media / import details crash (derpdead)

## CHANGELOG FOR v1.0.0-beta.6

- feature [#600](https://github.com/ergonode/frontend/pull/600) Added async dictionaries (derpdead)
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<!--
How to do a release:
How to do a release and publish modules:
1. Make sure you have publish access for all packages:
- You must be in the developers team in the npm @ergonode organization
- You must have publish access to all @ergonode modules
2. Merge develop to master and from master create release branch (release/v0.9.0).
3. Run `npm run publish:all ${semver}` - semver is semantic version (1.0.0, major, minor, path, etc.)
4A. If everything works properly, all modules are published and CHANGELOG will be created
4B. If the publish fails half-way, things have gotten hairy. Now you need to
2. Create release branch from develop branch (release/v0.9.0).
3. Switch to release branch and edit everything you need for the release.
4. Run `npm run publish:all ${semver}` - semver is semantic version (1.0.0, major, minor, path, etc.)
5A. If everything works properly, all modules are published and CHANGELOG will be created
5B. If the publish fails half-way, things have gotten hairy. Now you need to
go to npm to check which packages have been published and manually publish
the ones that have not been published yet.
5. Edit CHANGELOG and other things and push changes to release branch.
4. Go to GitHub and merge release branch to master branch.
5. Go to GitHub and verify that the changelog is live.
6. Go to GitHub releases page and publish the release.
7. Merge master branch to develop branch.
-->
<p align="center">
<a href="https://ergonode.com" rel="noopener noreferrer">
<img width="300" src="https://ergonode.com/img/logo-dark.svg" alt="Ergonode logo">
<img width="300" src="/static/images/logo.svg" alt="Ergonode logo">
</a>
</p>
<p align="center">Desktop PWA Ready Product Information Management Platform</p>
Expand Down
18 changes: 5 additions & 13 deletions layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 5 additions & 7 deletions layouts/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"message": "chore(release): %s"
}
},
"version": "1.0.0-beta.6"
"version": "1.0.0-beta.7"
}
36 changes: 36 additions & 0 deletions lib/index-info.js
Original file line number Diff line number Diff line change
@@ -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();
1 change: 1 addition & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions middleware/modulesMiddlewareLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
2 changes: 1 addition & 1 deletion modules/@ergonode/activity-logs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ergonode/activity-logs",
"version": "1.0.0-beta.6",
"version": "1.0.0-beta.7",
"author": "Team Ergonode <[email protected]>",
"description": "Ergonode activity logs module",
"license": "OSL-3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
/*
* Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
* See LICENSE for license details.
*/
<template>
<Grid
:columns="columns"
:data-count="filtered"
:rows="rows"
:sort-order="sortOrder"
:filters="filterValues"
:pagination="pagination"
:extended-components="extendedGridComponents"
:is-prefetching-data="isPrefetchingData"
:is-basic-filter="true"
:is-border="true"
@pagination="onPaginationChange"
@sort-column="onColumnSortChange"
@filter="onFilterChange"
@remove-all-filters="onRemoveAllFilters" />
</template>

<script>
import {
ALERT_TYPE,
} from '@Core/defaults/alerts';
import {
DEFAULT_PAGE,
} from '@Core/defaults/grid';
import extendedGridComponentsMixin from '@Core/mixins/grid/extendedGridComponentsMixin';
import {
getDefaultDataFromQueryParams,
getParams,
getParsedFilters,
} from '@Core/models/mappers/gridDataMapper';
import {
getGridData,
} from '@Core/services/grid/getGridData.service';
import Grid from '@UI/components/Grid/Grid';
export default {
name: 'UsersActivityLogsGrid',
components: {
Grid,
},
mixins: [
extendedGridComponentsMixin,
],
async fetch() {
await this.onFetchData();
this.isPrefetchingData = false;
},
data() {
const {
filterValues,
pagination,
sortOrder,
} = getDefaultDataFromQueryParams(this.$route);
return {
filterValues,
pagination,
sortOrder,
rows: [],
columns: [],
filtered: 0,
isPrefetchingData: true,
};
},
watch: {
$route(from, to) {
if (from.name !== to.name) {
return;
}
const {
filterValues,
pagination,
sortOrder,
} = getDefaultDataFromQueryParams(this.$route);
this.filterValues = filterValues;
this.pagination = pagination;
this.sortOrder = sortOrder;
this.onFetchData();
},
},
methods: {
async onFetchData() {
await getGridData({
$route: this.$route,
$cookies: this.$cookies,
$axios: this.$axios,
path: 'accounts/log',
params: getParams({
$route: this.$route,
$cookies: this.$cookies,
}),
onSuccess: this.onFetchDataSuccess,
onError: this.onFetchDataError,
});
},
onFetchDataSuccess({
columns,
rows,
filtered,
}) {
this.columns = columns;
this.rows = rows;
this.filtered = filtered;
},
onFetchDataError() {
this.$addAlert({
type: ALERT_TYPE.ERROR,
message: 'Users activity logs haven’t been fetched properly',
});
},
onRemoveAllFilters() {
this.$router.replace({
query: {
...this.$route.query,
filter: '',
page: DEFAULT_PAGE,
},
});
},
onFilterChange(filters) {
this.$router.replace({
query: {
...this.$route.query,
page: DEFAULT_PAGE,
filter: getParsedFilters(filters),
},
});
},
onColumnSortChange(sortOrder) {
this.$router.replace({
query: {
...this.$route.query,
...sortOrder,
},
});
},
onPaginationChange(pagination) {
this.$router.replace({
query: {
...this.$route.query,
...pagination,
},
});
},
},
};
</script>

This file was deleted.

Loading

0 comments on commit cbf8689

Please sign in to comment.