Skip to content
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

Jump to bottom

Implemented: logic to highlight the selected mapping chip (#295) #296

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Implemented: logic to highlight the selected mapping chip (#295) #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/components/CreateMappingModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ export default defineComponent({
const fields = process.env["VUE_APP_MAPPING_" + this.mappingType];
return fields ? JSON.parse(fields) : {};
},
closeModal() {
modalController.dismiss({ dismissed: true });
closeModal(mappingId = "") {
modalController.dismiss({ dismissed: true, mappingId });
},
async saveMapping() {
if(!this.mappingName) {
Expand All @@ -123,7 +123,7 @@ export default defineComponent({
}
const id = this.generateUniqueMappingPrefId();
await this.store.dispatch("user/createFieldMapping", { id, name: this.mappingName, value: this.fieldMapping, mappingType: this.mappingType })
this.closeModal();
this.closeModal(id);
},
areAllFieldsSelected() {
return Object.values(this.fieldMapping).every(field => field !== "");
Expand Down
13 changes: 11 additions & 2 deletions src/views/Inventory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ion-icon :icon="addOutline" />
<ion-label>{{ translate("New mapping") }}</ion-label>
</ion-chip>
<ion-chip :disabled="!this.content.length" v-for="(mapping, index) in fieldMappings('RSTINV') ?? []" :key="index" @click="mapFields(mapping)" outline="true">
<ion-chip :disabled="!this.content.length" v-for="(mapping, index) in fieldMappings('RSTINV') ?? []" :key="index" @click="mapFields(mapping, index)" :outline="selectedMappingId != index">
{{ mapping.name }}
</ion-chip>
</div>
Expand Down Expand Up @@ -95,6 +95,7 @@ export default defineComponent({
fileColumns: [],
fields: process.env["VUE_APP_MAPPING_RSTINV"] ? JSON.parse(process.env["VUE_APP_MAPPING_RSTINV"]) : {},
identificationTypeId: "SHOPIFY_PROD_SKU",
selectedMappingId: ""
}
},
computed: {
Expand All @@ -116,7 +117,7 @@ export default defineComponent({
this.store.dispatch('util/fetchGoodIdentificationTypes');
},
methods: {
mapFields(mapping) {
mapFields(mapping, mappingId) {
const fieldMapping = JSON.parse(JSON.stringify(mapping));

// TODO: Store an object in this.content variable, so everytime when accessing it, we don't need to use 0th index
Expand All @@ -134,6 +135,7 @@ export default defineComponent({
}
})
this.fieldMapping = fieldMapping.value;
this.selectedMappingId = mappingId;
},
async parse(event) {
const file = event.target.files[0];
Expand Down Expand Up @@ -179,6 +181,13 @@ export default defineComponent({
component: CreateMappingModal,
componentProps: { content: this.content, seletedFieldMapping: this.fieldMapping, mappingType: 'RSTINV'}
});

createMappingModal.onDidDismiss().then((result) => {
if(result.data?.mappingId) {
this.selectedMappingId = result.data.mappingId
}
})

return createMappingModal.present();
}
},
Expand Down
15 changes: 12 additions & 3 deletions src/views/PurchaseOrder.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ion-icon :icon="addOutline" />
<ion-label>{{ translate("New mapping") }}</ion-label>
</ion-chip>
<ion-chip :disabled="!this.content.length" v-for="(mapping, index) in fieldMappings('PO') ?? []" :key="index" @click="mapFields(mapping)" outline="true">
<ion-chip :disabled="!this.content.length" v-for="(mapping, index) in fieldMappings('PO') ?? []" :key="index" @click="mapFields(mapping, index)" :outline="selectedMappingId != index">
{{ mapping.name }}
</ion-chip>
</div>
Expand Down Expand Up @@ -91,7 +91,8 @@ export default defineComponent({
content: [],
fieldMapping: {},
fileColumns: [],
fields: process.env["VUE_APP_MAPPING_PO"] ? JSON.parse(process.env["VUE_APP_MAPPING_PO"]) : {}
fields: process.env["VUE_APP_MAPPING_PO"] ? JSON.parse(process.env["VUE_APP_MAPPING_PO"]) : {},
selectedMappingId: ""
}
},
ionViewDidEnter() {
Expand Down Expand Up @@ -142,7 +143,7 @@ export default defineComponent({
name:'PurchaseOrderReview'
})
},
mapFields(mapping) {
mapFields(mapping, mappingId) {
const fieldMapping = JSON.parse(JSON.stringify(mapping));

// TODO: Store an object in this.content variable, so everytime when accessing it, we don't need to use 0th index
Expand All @@ -160,6 +161,7 @@ export default defineComponent({
}
})
this.fieldMapping = fieldMapping.value;
this.selectedMappingId = mappingId;
},
areAllFieldsSelected() {
return Object.values(this.fieldMapping).every(field => field !== "");
Expand All @@ -169,6 +171,13 @@ export default defineComponent({
component: CreateMappingModal,
componentProps: { content: this.content, seletedFieldMapping: this.fieldMapping, mappingType: 'PO'}
});

createMappingModal.onDidDismiss().then((result) => {
if(result.data?.mappingId) {
this.selectedMappingId = result.data.mappingId
}
})

return createMappingModal.present();
}
},
Expand Down
13 changes: 11 additions & 2 deletions src/views/ScheduledRestock.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ion-icon :icon="addOutline" />
<ion-label>{{ translate("New mapping") }}</ion-label>
</ion-chip>
<ion-chip :disabled="!this.content.length" outline="true" v-for="(mapping, index) in fieldMappings('RSTSTK') ?? []" :key="index" @click="mapFields(mapping)">
<ion-chip :disabled="!this.content.length" :outline="selectedMappingId != index" v-for="(mapping, index) in fieldMappings('RSTSTK') ?? []" :key="index" @click="mapFields(mapping, index)">
{{ mapping.name }}
</ion-chip>
</div>
Expand Down Expand Up @@ -187,6 +187,7 @@ export default defineComponent({
isUpdateDateTimeModalOpen: false,
shopId: '',
currentJob: {},
selectedMappingId: ""
}
},
computed: {
Expand Down Expand Up @@ -305,7 +306,7 @@ export default defineComponent({
logger.error(err)
}
},
mapFields(mapping) {
mapFields(mapping, mappingId) {
const fieldMapping = JSON.parse(JSON.stringify(mapping));

// TODO: Store an object in this.content variable, so everytime when accessing it, we don't need to use 0th index
Expand All @@ -323,6 +324,7 @@ export default defineComponent({
}
})
this.fieldMapping = fieldMapping.value;
this.selectedMappingId = mappingId;
},
async parse(event) {
const file = event.target.files[0];
Expand Down Expand Up @@ -387,6 +389,13 @@ export default defineComponent({
component: CreateMappingModal,
componentProps: { content: this.content, seletedFieldMapping: this.fieldMapping, mappingType: 'RSTSTK'}
});

createMappingModal.onDidDismiss().then((result) => {
if(result.data?.mappingId) {
this.selectedMappingId = result.data.mappingId
}
})

return createMappingModal.present();
},
async updateProductStore(productStoreId) {
Expand Down
Loading