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 #727 from bleto/release/v1.0.0-beta.9
Browse files Browse the repository at this point in the history
Release/v1.0.0 beta.9
  • Loading branch information
bleto authored Feb 26, 2021
2 parents 115fabe + 0e00038 commit 1cff617
Show file tree
Hide file tree
Showing 607 changed files with 18,724 additions and 9,772 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ vendor/
.history/
.vscode/
modules.config.js
package.json
package-lock.json
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module.exports = {
'simple-import-sort',
'import',
'modules-newline',
'json-format',
],
rules: {
'no-empty-pattern': 'off',
Expand Down Expand Up @@ -138,6 +139,7 @@ module.exports = {
ignoreUrls: true,
ignoreStrings: true,
ignoreTemplateLiterals: true,
ignorePattern: '="\\$t\\(',
},
],
'vue/component-name-in-template-casing': [
Expand Down
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,39 @@
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.9
- feature [#669](https://github.com/ergonode/frontend/pull/669) Categories sidebar (derpdead)
- feature [#676](https://github.com/ergonode/frontend/pull/676) Designers unification (derpdead)
- feature [#678](https://github.com/ergonode/frontend/pull/678) Privileges validation (derpdead)
- feature [#680](https://github.com/ergonode/frontend/pull/680) Scheduler new validation (bleto)
- feature [#682](https://github.com/ergonode/frontend/pull/682) Action center placeholder (derpdead)
- feature [#683](https://github.com/ergonode/frontend/pull/683) Notification list visual update (derpdead)
- feature [#686](https://github.com/ergonode/frontend/pull/686) New extension slots (bleto)
- feature [#687](https://github.com/ergonode/frontend/pull/687) Progressive notifications (derpdead)
- feature [#689](https://github.com/ergonode/frontend/pull/689) Filter by not assigned categories (derpdead)
- feature [#692](https://github.com/ergonode/frontend/pull/692) Isolate batch action (derpdead)
- feature [#695](https://github.com/ergonode/frontend/pull/695) Product translations (derpdead)
- feature [#698](https://github.com/ergonode/frontend/pull/698) Order extended form fields (bleto)
- feature [#715](https://github.com/ergonode/frontend/pull/715) Extend property method (bleto)
- bugfix [#677](https://github.com/ergonode/frontend/pull/677) Allow scrolling for Categories in Sidebar (derpdead)
- bugfix [#684](https://github.com/ergonode/frontend/pull/684) Tree designer bugs (derpdead)
- bugfix [#685](https://github.com/ergonode/frontend/pull/685) Designers stabilisation - FF (derpdead)
- bugfix [#690](https://github.com/ergonode/frontend/pull/690) Dismissing product modals, better feedback support (derpdead)
- bugfix [#694](https://github.com/ergonode/frontend/pull/694) Change scheduler form (bleto)
- bugfix [#700](https://github.com/ergonode/frontend/pull/700) Add alert to remove action (bleto)
- bugfix [#701](https://github.com/ergonode/frontend/pull/701) Drag and drop - FF (derpdead)
- bugfix [#710](https://github.com/ergonode/frontend/pull/710) Privileges error (bleto)
- bugfix [#712](https://github.com/ergonode/frontend/pull/712) Sorting products, complex filter fix (derpdead)
- bugfix [#713](https://github.com/ergonode/frontend/pull/713) privileges bug fix (bleto)
- bugfix [#719](https://github.com/ergonode/frontend/pull/719) Mapping filter operators (derpdead)
- refactor [#670](https://github.com/ergonode/frontend/pull/670) i18n translations - attributes (bleto)
- refactor [#675](https://github.com/ergonode/frontend/pull/675) Change extends structure (bleto)
- performance [#699](https://github.com/ergonode/frontend/pull/699) Improve select row algorithm (derpdead)
- performance [#724](https://github.com/ergonode/frontend/pull/724) Privileges improvement (derpdead)
- performance [#726](https://github.com/ergonode/frontend/pull/726) Stabilisation (derpdead)


## CHANGELOG FOR v1.0.0-beta.8

- feature [#650](https://github.com/ergonode/frontend/pull/650) Missing logic for changed values by user (derpdead)
Expand Down
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.8"
"version": "1.0.0-beta.9"
}
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.8",
"version": "1.0.0-beta.9",
"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
Expand Up @@ -17,7 +17,8 @@
@pagination="onPaginationChange"
@sort-column="onColumnSortChange"
@filter="onFilterChange"
@remove-all-filters="onRemoveAllFilters" />
@remove-all-filters="onRemoveAllFilters"
v-bind="extendedProps['grid']" />
</template>

<script>
Expand All @@ -27,6 +28,7 @@ import {
import {
DEFAULT_PAGE,
} from '@Core/defaults/grid';
import extendPropsMixin from '@Core/mixins/extend/extendProps';
import extendedGridComponentsMixin from '@Core/mixins/grid/extendedGridComponentsMixin';
import {
getDefaultDataFromQueryParams,
Expand All @@ -44,6 +46,12 @@ export default {
Grid,
},
mixins: [
extendPropsMixin({
extendedKey: '@ActivityLogs/components/Grids/UsersActivityLogsGrid/props',
extendedNames: [
'grid',
],
}),
extendedGridComponentsMixin,
],
async fetch() {
Expand Down Expand Up @@ -116,27 +124,36 @@ export default {
onFetchDataError() {
this.$addAlert({
type: ALERT_TYPE.ERROR,
message: 'Users activity logs haven’t been fetched properly',
message: this.$t('@ActivityLogs.activityLog.components.UsersActivityLogsGrid.getRequest'),
});
},
onRemoveAllFilters() {
const query = {
...this.$route.query,
page: DEFAULT_PAGE,
};
delete query.filter;
this.$router.replace({
query: {
...this.$route.query,
filter: '',
page: DEFAULT_PAGE,
},
query,
});
this.isPrefetchingData = true;
},
onFilterChange(filters) {
const query = {
...this.$route.query,
page: DEFAULT_PAGE,
filter: getParsedFilters(filters),
};
if (query.filter === '' || query.filter === null) {
delete query.filter;
}
this.$router.replace({
query: {
...this.$route.query,
page: DEFAULT_PAGE,
filter: getParsedFilters(filters),
},
query,
});
},
onColumnSortChange(sortOrder) {
Expand Down
13 changes: 10 additions & 3 deletions modules/@ergonode/activity-logs/src/locales/en_GB.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{
"activityLogs": {
"page": {
"title": "Users activity logs"
"@ActivityLogs": {
"activityLog": {
"_": {
"title": "Users activity logs"
},
"components": {
"UsersActivityLogsGrid": {
"getRequest": "Users activity logs haven’t been fetched properly"
}
}
}
}
}
14 changes: 14 additions & 0 deletions modules/@ergonode/activity-logs/src/locales/pl_PL.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"@ActivityLogs": {
"activityLog": {
"_": {
"title": "Log aktywności użytkownika"
},
"components": {
"UsersActivityLogsGrid": {
"getRequest": "Logi aktywności użytkownika nie zostały pobrane prawidłowo"
}
}
}
}
}
37 changes: 35 additions & 2 deletions modules/@ergonode/activity-logs/src/pages/activity-logs/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,28 @@
<template>
<Page>
<TitleBar
:title="$t('activityLogs.page.title')"
:is-read-only="isReadOnly" />
:title="$t('@ActivityLogs.activityLog._.title')"
:is-read-only="isReadOnly">
<template #mainAction>
<template
v-for="(actionItem, index) in extendedMainAction">
<Component
:is="actionItem.component"
:key="index"
v-bind="bindingProps(actionItem)" />
</template>
</template>
</TitleBar>
<HorizontalRoutingTabBar
v-if="asyncTabs"
:items="asyncTabs" />
<template
v-for="(modal, index) in extendedModals">
<Component
:is="modal.component"
:key="index"
v-bind="bindingProps(modal)" />
</template>
</Page>
</template>

Expand All @@ -33,9 +50,25 @@ export default {
asyncTabsMixin,
],
computed: {
extendedMainAction() {
return this.$getExtendSlot('@ActivityLogs/pages/activity-logs/mainAction');
},
extendedModals() {
return this.$getExtendSlot('@ActivityLogs/pages/activity-logs/injectModal');
},
isReadOnly() {
return this.$isReadOnly(PRIVILEGES.USER.namespace);
},
},
methods: {
bindingProps({
props = {},
}) {
return {
privileges: PRIVILEGES.USER,
...props,
};
},
},
};
</script>
2 changes: 1 addition & 1 deletion modules/@ergonode/attributes/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ergonode/attributes",
"version": "1.0.0-beta.8",
"version": "1.0.0-beta.9",
"author": "Team Ergonode <[email protected]>",
"description": "Ergonode attributes module",
"license": "OSL-3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
* Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
* See LICENSE for license details.
*/
<template>
<Autocomplete
:data-cy="dataCy"
:value="value"
:required="required"
:searchable="true"
:multiselect="multiselect"
:clearable="clearable"
:label="$t('@Attributes.attributeGroup.components.AttributeGroupsAutocomplete.groupLabel')"
:custom-fetch-event="attributeGroupCreatedEventName"
:error-messages="errorMessages"
:disabled="disabled"
href="attributes/groups/autocomplete"
@input="onValueChange">
<template #noDataPlaceholder>
<SelectListNoDataPlaceholder
:title="noDataPlaceholder.title"
:subtitle="noDataPlaceholder.subtitle">
<template #action>
<CreateAttributeGroupButton />
</template>
</SelectListNoDataPlaceholder>
</template>
</Autocomplete>
</template>

<script>
import CreateAttributeGroupButton from '@Attributes/components/Buttons/CreateAttributeGroupButton';
import {
ATTRIBUTE_GROUP_CREATED_EVENT_NAME,
} from '@Attributes/defaults/attributes';
import Autocomplete from '@UI/components/Autocomplete/Autocomplete';
import SelectListNoDataPlaceholder from '@UI/components/SelectList/SelectListNoDataPlaceholder';
export default {
name: 'AttributeGroupsAutocomplete',
components: {
CreateAttributeGroupButton,
SelectListNoDataPlaceholder,
Autocomplete,
},
props: {
value: {
type: [
String,
Array,
],
default: '',
},
errorMessages: {
type: String,
default: '',
},
disabled: {
type: Boolean,
default: false,
},
required: {
type: Boolean,
default: false,
},
multiselect: {
type: Boolean,
default: false,
},
clearable: {
type: Boolean,
default: false,
},
dataCy: {
type: String,
default: '',
},
},
computed: {
attributeGroupCreatedEventName() {
return ATTRIBUTE_GROUP_CREATED_EVENT_NAME;
},
noDataPlaceholder() {
return {
title: this.$t('@Attributes.attributeGroup._.noGroups'),
subtitle: this.$t('@Attributes.attributeGroup._.createFirst'),
};
},
},
methods: {
onValueChange(value) {
this.$emit('input', value);
},
},
};
</script>
Loading

0 comments on commit 1cff617

Please sign in to comment.