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 #672 from ergonode/release/v1.0.0-beta.8
Browse files Browse the repository at this point in the history
v1.0.0 beta.8
  • Loading branch information
derpdead authored Jan 28, 2021
2 parents cbf8689 + 2a66bae commit 115fabe
Show file tree
Hide file tree
Showing 323 changed files with 7,594 additions and 3,634 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
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.8

- feature [#650](https://github.com/ergonode/frontend/pull/650) Missing logic for changed values by user (derpdead)
- feature [#655](https://github.com/ergonode/frontend/pull/655) Add badges to CategorySelect (derpdead)
- feature [#656](https://github.com/ergonode/frontend/pull/656) SideBar placeholders (derpdead)
- feature [#657](https://github.com/ergonode/frontend/pull/657) Support for logo icon bounds (derpdead)
- feature [#647](https://github.com/ergonode/frontend/pull/647) Paragraph component (bleto)
- feature [#666](https://github.com/ergonode/frontend/pull/666) Dropdown placeholders (derpdead)
- performance [#652](https://github.com/ergonode/frontend/pull/652) Dropdown position calculations (derpdead)
- refactor [#642](https://github.com/ergonode/frontend/pull/642) Global css (MichaelGitArt)
- refactor [#663](https://github.com/ergonode/frontend/pull/663) Authentication module (bleto)
- bugfix [#651](https://github.com/ergonode/frontend/pull/651) Flashing user interface translations (derpdead)
- bugfix [#653](https://github.com/ergonode/frontend/pull/653) Missing initial sources dictionary (derpdead)
- bugfix [#654](https://github.com/ergonode/frontend/pull/654) Prevent duplicating attribute groups at SideBar (derpdead)
- bugfix [#658](https://github.com/ergonode/frontend/pull/658) Validation mapper (derpdead)
- bugfix [#659](https://github.com/ergonode/frontend/pull/659) Grid table layout shifts (derpdead)
- bugfix [#660](https://github.com/ergonode/frontend/pull/659) Password recovery and infographics (bleto)
- bugfix [#667](https://github.com/ergonode/frontend/pull/667) bugfixes (derpdead)

## CHANGELOG FOR v1.0.0-beta.7

- feature [#623](https://github.com/ergonode/frontend/pull/623) Remove drafts (derpdead)
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module.exports = {
'^~/(.*)$': '<rootDir>/$1',
'@UI/(.*)$': '<rootDir>/modules/@ergonode/ui/src/$1',
'@Core/(.*)$': '<rootDir>/modules/@ergonode/core/src/$1',
'@Authentication/(.*)$': '<rootDir>/modules/@ergonode/core/src/$1',
'@Templates/(.*)$': '<rootDir>/modules/@ergonode/product-templates/src/$1',
'@Attributes/(.*)$': '<rootDir>/modules/@ergonode/attributes/src/$1',
'@Notifications/(.*)$': '<rootDir>/modules/@ergonode/notifications/src/$1',
Expand Down
2 changes: 1 addition & 1 deletion layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import DefaultLayout from '@Core/layouts/default';
import {
defaultLayoutMiddleware,
} from '@Core/middleware/layouts';
} from '@Core/middleware/layout';
export default {
name: 'NuxtDefaultLayout',
Expand Down
4 changes: 2 additions & 2 deletions layouts/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
</template>

<script>
import LoginLayout from '@Core/layouts/login';
import LoginLayout from '@Authentication/layouts/login';
import {
loginLayoutMiddleware,
} from '@Core/middleware/layouts';
} from '@Authentication/middleware/layout';
export default {
name: 'NuxtLoginLayout',
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.7"
"version": "1.0.0-beta.8"
}
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.7",
"version": "1.0.0-beta.8",
"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 @@ -69,7 +69,7 @@ export default {
};
},
watch: {
$route(from, to) {
async $route(from, to) {
if (from.name !== to.name) {
return;
}
Expand All @@ -84,7 +84,9 @@ export default {
this.pagination = pagination;
this.sortOrder = sortOrder;
this.onFetchData();
await this.onFetchData();
this.isPrefetchingData = false;
},
},
methods: {
Expand Down Expand Up @@ -125,6 +127,8 @@ export default {
page: DEFAULT_PAGE,
},
});
this.isPrefetchingData = true;
},
onFilterChange(filters) {
this.$router.replace({
Expand Down
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.7",
"version": "1.0.0-beta.8",
"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,100 @@
/*
* Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
* See LICENSE for license details.
*/
<template>
<FeedbackProvider
:errors="errors"
:change-values="changeValues">
<template #default="{ hasValueToSave }">
<Button
data-cy="submit"
:title="$t('core.buttons.submit')"
:floating="{ bottom: '24px', right: '24px' }"
:disabled="!isAllowedToUpdate"
@click.native="onSubmit">
<template #prepend="{ color }">
<IconSpinner
v-if="isSubmitting"
:fill-color="color" />
<IconSync
v-else-if="hasValueToSave"
:fill-color="color" />
</template>
</Button>
</template>
</FeedbackProvider>
</template>

<script>
import PRIVILEGES from '@Attributes/config/privileges';
import {
ALERT_TYPE,
} from '@Core/defaults/alerts';
import updateButtonFeedbackMixin from '@Core/mixins/feedback/updateButtonFeedbackMixin';
import Button from '@UI/components/Button/Button';
import FeedbackProvider from '@UI/components/Feedback/FeedbackProvider';
import IconSpinner from '@UI/components/Icons/Feedback/IconSpinner';
import IconSync from '@UI/components/Icons/Feedback/IconSync';
import {
mapActions,
} from 'vuex';
export default {
name: 'UpdateAttributeGroupTranslationButton',
components: {
FeedbackProvider,
Button,
IconSpinner,
IconSync,
},
mixins: [
updateButtonFeedbackMixin,
],
data() {
return {
isSubmitting: false,
};
},
computed: {
isAllowedToUpdate() {
return this.$hasAccess([
PRIVILEGES.ATTRIBUTE_GROUP.update,
]);
},
},
methods: {
...mapActions('attributeGroup', [
'updateAttributeGroup',
]),
onSubmit() {
if (this.isSubmitting) {
return;
}
this.isSubmitting = true;
this.removeScopeErrors(this.scope);
this.updateAttributeGroup({
scope: this.scope,
onSuccess: this.onUpdateSuccess,
onError: this.onUpdateError,
});
},
onUpdateSuccess() {
this.$addAlert({
type: ALERT_TYPE.SUCCESS,
message: this.$t('attributeGroup.messages.updateTranslationSuccess'),
});
this.isSubmitting = false;
this.markChangeValuesAsSaved(this.scope);
},
onUpdateError(errors) {
this.onError(errors);
this.isSubmitting = false;
},
},
};
</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
* See LICENSE for license details.
*/
<template>
<FeedbackProvider
:errors="errors"
:change-values="changeValues">
<template #default="{ hasValueToSave }">
<Button
data-cy="submit"
:title="$t('core.buttons.submit')"
:floating="{ bottom: '24px', right: '24px' }"
:disabled="!isAllowedToUpdate"
@click.native="onSubmit">
<template #prepend="{ color }">
<IconSpinner
v-if="isSubmitting"
:fill-color="color" />
<IconSync
v-else-if="hasValueToSave"
:fill-color="color" />
</template>
</Button>
</template>
</FeedbackProvider>
</template>

<script>
import PRIVILEGES from '@Attributes/config/privileges';
import {
ALERT_TYPE,
} from '@Core/defaults/alerts';
import updateButtonFeedbackMixin from '@Core/mixins/feedback/updateButtonFeedbackMixin';
import Button from '@UI/components/Button/Button';
import FeedbackProvider from '@UI/components/Feedback/FeedbackProvider';
import IconSpinner from '@UI/components/Icons/Feedback/IconSpinner';
import IconSync from '@UI/components/Icons/Feedback/IconSync';
import {
mapActions,
} from 'vuex';
export default {
name: 'UpdateAttributeTranslationButton',
components: {
FeedbackProvider,
Button,
IconSpinner,
IconSync,
},
mixins: [
updateButtonFeedbackMixin,
],
data() {
return {
isSubmitting: false,
};
},
computed: {
isAllowedToUpdate() {
return this.$hasAccess([
PRIVILEGES.ATTRIBUTE.update,
]);
},
},
methods: {
...mapActions('attribute', [
'updateAttribute',
]),
onSubmit() {
if (this.isSubmitting) {
return;
}
this.isSubmitting = true;
this.removeScopeErrors(this.scope);
this.updateAttribute({
scope: this.scope,
onSuccess: this.onUpdateSuccess,
onError: this.onUpdateError,
});
},
onUpdateSuccess() {
this.$addAlert({
type: ALERT_TYPE.SUCCESS,
message: this.$t('attribute.messages.updateTranslationSuccess'),
});
this.isSubmitting = false;
this.markChangeValuesAsSaved(this.scope);
},
onUpdateError(errors) {
this.onError(errors);
this.isSubmitting = false;
},
},
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
:is-submitting="isSubmitting"
:is-proceeding="isProceeding"
:errors="errors"
:change-values="changeValues"
:errors-presentation-mapper="errorMapper"
@proceed="onProceed"
@submit="onSubmit">
Expand Down Expand Up @@ -101,8 +102,8 @@ import {
import {
SIZE,
} from '@Core/defaults/theme';
import formFeedbackMixin from '@Core/mixins/feedback/formFeedbackMixin';
import formActionsMixin from '@Core/mixins/form/formActionsMixin';
import formFeedbackMixin from '@Core/mixins/form/formFeedbackMixin';
import {
getKeyByValue,
isObject,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
:is-submitting="isSubmitting"
:is-proceeding="isProceeding"
:errors="errors"
:change-values="changeValues"
@proceed="onProceed"
@submit="onSubmit">
<template #body>
Expand Down Expand Up @@ -37,8 +38,8 @@

<script>
import PRIVILEGES from '@Attributes/config/privileges';
import formFeedbackMixin from '@Core/mixins/feedback/formFeedbackMixin';
import formActionsMixin from '@Core/mixins/form/formActionsMixin';
import formFeedbackMixin from '@Core/mixins/form/formFeedbackMixin';
import Divider from '@UI/components/Dividers/Divider';
import Form from '@UI/components/Form/Form';
import FormSection from '@UI/components/Form/Section/FormSection';
Expand Down
Loading

0 comments on commit 115fabe

Please sign in to comment.