Skip to content

Collaboration, languages refactor and more #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BranDavidSebastian merged 6 commits into from
Apr 1, 2026
Merged

Collaboration, languages refactor and more #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5b4a5d1
#604 imrpove mirakl document type page
BranDavidSebastian Mar 28, 2026
5000d7b
#321 full notifications layer + collaboration
BranDavidSebastian Mar 30, 2026
5ab6ebc
A lot of improvements
BranDavidSebastian Mar 31, 2026
0e7f8d2
add notifications pagination
BranDavidSebastian Mar 31, 2026
da64568
add browser notifications
BranDavidSebastian Apr 1, 2026
9548a2c
adjsut tab order
BranDavidSebastian Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/assets/audio/notification.mp3
View file
Open in desktop
Binary file not shown.
522 changes: 522 additions & 0 deletions ...rs/remote-document-types/components/categories-lists/MiraklDocumentTypeCategoriesList.vue
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion ...rs/remote-document-types/components/categories-lists/RemoteDocumentTypeCategoriesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { computed } from 'vue';
import AmazonDocumentTypeCategoriesList from './AmazonDocumentTypeCategoriesList.vue';
import EbayDocumentTypeCategoriesList from './EbayDocumentTypeCategoriesList.vue';
import MiraklDocumentTypeCategoriesList from './MiraklDocumentTypeCategoriesList.vue';
import SheinDocumentTypeCategoriesList from './SheinDocumentTypeCategoriesList.vue';

type CategoryId = string | number;
Expand All @@ -24,6 +25,8 @@ const currentComponent = computed(() => {
return AmazonDocumentTypeCategoriesList;
case 'ebay':
return EbayDocumentTypeCategoriesList;
case 'mirakl':
return MiraklDocumentTypeCategoriesList;
case 'shein':
return SheinDocumentTypeCategoriesList;
default:
Expand All @@ -36,7 +39,7 @@ const updateValue = (value: CategoryId[]) => {
};

const componentProps = computed(() =>
props.type === 'ebay' || props.type === 'amazon' || props.type === 'shein'
props.type === 'ebay' || props.type === 'amazon' || props.type === 'mirakl' || props.type === 'shein'
? {
salesChannelId: props.salesChannelId ?? null,
errorMessage: props.errorMessage ?? '',
Expand Down
53 changes: 36 additions & 17 deletions ...show/containers/properties/containers/remote-properties/components/RemotePropertyEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
<script setup lang="ts">
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import GeneralTemplate from "../../../../../../../../../shared/templates/GeneralTemplate.vue";
import { Breadcrumbs } from "../../../../../../../../../shared/components/molecules/breadcrumbs";
import { GeneralForm } from "../../../../../../../../../shared/components/organisms/general-form";
import type { FormConfig } from "../../../../../../../../../shared/components/organisms/general-form/formConfig";
import { Tabs } from "../../../../../../../../../shared/components/molecules/tabs";
import { CollaborationTab } from "../../../../../../../../../shared/components/organisms/collaboration-tab";

interface BreadcrumbLink {
path?: {
Expand All @@ -17,6 +22,13 @@ const props = defineProps<{
breadcrumbsLinks: BreadcrumbLink[];
formConfig: FormConfig | null;
}>();
const { t } = useI18n();
const route = useRoute();
const targetId = ref(String(route.params.id));
const tabItems = [
{ name: 'general', label: t('shared.tabs.mapping'), icon: 'circle-info', alwaysRender: true },
{ name: 'collaboration', label: t('shared.tabs.collaboration'), icon: 'comment-dots' },
];

const emit = defineEmits<{
(e: 'set-data', value: any): void;
Expand All @@ -38,25 +50,32 @@ const handleFormUpdated = (form: Record<string, any>) => {
<Breadcrumbs :links="props.breadcrumbsLinks" />
</template>
<template #content>
<GeneralForm
v-if="props.formConfig"
:config="props.formConfig"
@set-data="handleSetData"
@form-updated="handleFormUpdated"
>
<template #before-fields>
<slot name="before-form" />
<Tabs :tabs="tabItems">
<template #general>
<GeneralForm
v-if="props.formConfig"
:config="props.formConfig"
@set-data="handleSetData"
@form-updated="handleFormUpdated"
>
<template #before-fields>
<slot name="before-form" />
</template>
<template #help-section>
<slot name="help-section" />
</template>
<template #additional-button>
<slot name="additional-button" />
</template>
<template #additional-fields>
<slot name="additional-fields" />
</template>
</GeneralForm>
</template>
<template #help-section>
<slot name="help-section" />
<template #collaboration>
<CollaborationTab :target-id="targetId" />
</template>
<template #additional-button>
<slot name="additional-button" />
</template>
<template #additional-fields>
<slot name="additional-fields" />
</template>
</GeneralForm>
</Tabs>
</template>
</GeneralTemplate>
</template>
2 changes: 1 addition & 1 deletion ...rty-select-values/containers/mirakl-property-select-values/MiraklPropertySelectValues.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const emit = defineEmits(['pull-data']);
const { t } = useI18n();

const searchConfig = computed(() => miraklPropertySelectValuesSearchConfigConstructor(t));
const listingConfig = computed(() => miraklPropertySelectValuesListingConfigConstructor(t, props.id));
const listingConfig = computed(() => miraklPropertySelectValuesListingConfigConstructor(t, props.id, props.salesChannelId));
const fixedFilterVariables = computed(() => ({
isPropertyValue: true,
}));
Expand Down
15 changes: 13 additions & 2 deletions ...-select-values/containers/mirakl-property-select-values/MiraklSelectValueEditProperty.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ const config: RemoteSelectValueEditPropertyConfig = {
valueQuery: getMiraklPropertySelectValueQuery,
valueDataKey: 'miraklPropertySelectValue',
mapValueData: valueData => ({
valueProxyId: valueData?.proxyId || null,
salesChannelId: valueData?.salesChannel?.id || null,
form: {
remoteProperty: valueData?.remoteProperty?.name || '',
boolValue: valueData?.boolValue ?? null,
Expand Down Expand Up @@ -182,8 +184,8 @@ const config: RemoteSelectValueEditPropertyConfig = {
},
},
notMappedBanner: {
titleKey: 'integrations.show.propertySelectValues.notMappedBanner.title',
contentKey: 'integrations.show.propertySelectValues.notMappedBanner.content',
titleKey: 'integrations.show.propertySelectValues.notMappedBannerMirakl.title',
contentKey: 'integrations.show.propertySelectValues.notMappedBannerMirakl.content',
linkPath: ctx => ({
name: 'integrations.remoteProperties.edit',
params: { type: ctx.type, id: ctx.propertyId! },
Expand All @@ -205,6 +207,15 @@ const config: RemoteSelectValueEditPropertyConfig = {
},
}
: null,
duplicateMapping: {
titleKey: 'integrations.show.propertySelectValues.duplicate.mirakl.title',
descriptionKey: 'integrations.show.propertySelectValues.duplicate.mirakl.description',
promptKey: 'integrations.show.propertySelectValues.duplicate.mirakl.prompt',
selectorHelpKey: 'integrations.show.propertySelectValues.duplicate.mirakl.help',
submitLabelKey: 'integrations.show.propertySelectValues.duplicate.mirakl.submit',
successMessageKey: 'integrations.show.propertySelectValues.duplicate.mirakl.success',
isVisible: ctx => Boolean(ctx.salesChannelId && ctx.valueProxyId && ctx.localPropertyId),
},
listRoute: ctx => ({
name: 'integrations.integrations.show',
params: { type: ctx.type, id: ctx.integrationId },
Expand Down
3 changes: 2 additions & 1 deletion ...how/containers/property-select-values/containers/mirakl-property-select-values/configs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ export const miraklPropertySelectValuesSearchConfigConstructor = (t: Function):
export const miraklPropertySelectValuesListingConfigConstructor = (
t: Function,
specificIntegrationId: string,
salesChannelId: string,
): ListingConfig => ({
headers: [
t('integrations.show.propertySelectValues.labels.localizedValue'),
Expand All @@ -102,7 +103,7 @@ export const miraklPropertySelectValuesListingConfigConstructor = (
addActions: true,
addEdit: true,
addShow: true,
urlQueryParams: { integrationId: specificIntegrationId },
urlQueryParams: { integrationId: specificIntegrationId, salesChannelId },
editUrlName: 'integrations.remotePropertySelectValues.edit',
showUrlName: 'integrations.remotePropertySelectValues.edit',
addDelete: false,
Expand Down
Loading