Added sourceHashMapping in frontend

Author: bbrands02

src/entities/synchronization/synchronization.mock.ts

@@ -9,6 +9,7 @@ export const mockSynchronizationData = (): TSynchronization[] => [
 		sourceId: 'source1',
 		sourceType: 'api',
 		sourceHash: 'source1',
+		sourceHashMapping: '1',
 		sourceTargetMapping: 'source1',
 		sourceConfig: {},
 		sourceLastChanged: '2023-05-01T12:00:00Z',
@@ -32,6 +33,7 @@ export const mockSynchronizationData = (): TSynchronization[] => [
 		sourceId: 'source2',
 		sourceType: 'api',
 		sourceHash: 'source2',
+		sourceHashMapping: '1',
 		sourceTargetMapping: 'source2',
 		sourceConfig: {},
 		sourceLastChanged: '2023-05-02T12:00:00Z',

src/entities/synchronization/synchronization.ts

@@ -11,6 +11,7 @@ export class Synchronization extends ReadonlyBaseClass implements TSynchronizati
 	public sourceId: string
 	public sourceType: string
 	public sourceHash: string
+	public sourceHashMapping: string
 	public sourceTargetMapping: string
 	public sourceConfig: Record<string, string>
 	public sourceLastChanged: string
@@ -35,6 +36,7 @@ export class Synchronization extends ReadonlyBaseClass implements TSynchronizati
 			sourceId: synchronization.sourceId || '',
 			sourceType: synchronization.sourceType || '',
 			sourceHash: synchronization.sourceHash || '',
+			sourceHashMapping: synchronization.sourceHashMapping || '',
 			sourceTargetMapping: synchronization.sourceTargetMapping || '',
 			sourceConfig: synchronization.sourceConfig || {},
 			sourceLastChanged: synchronization.sourceLastChanged || '',
@@ -63,6 +65,7 @@ export class Synchronization extends ReadonlyBaseClass implements TSynchronizati
 			sourceId: z.string(),
 			sourceType: z.string(),
 			sourceHash: z.string(),
+			sourceHashMapping: z.string(),
 			sourceTargetMapping: z.string(),
 			sourceConfig: z.record(z.string(), z.string()),
 			sourceLastChanged: z.string(),

src/entities/synchronization/synchronization.types.ts

@@ -5,6 +5,7 @@ export type TSynchronization = {
     sourceId: string
     sourceType: string
     sourceHash: string
+    sourceHashMapping: string
     sourceTargetMapping: string
     sourceConfig: Record<string, string>
     sourceLastChanged: string

src/modals/Synchronization/EditSynchronization.vue

@@ -90,10 +90,15 @@ import { synchronizationStore, navigationStore, sourceStore, mappingStore } from
 					:loading="sourcesLoading"
 					input-label="Source ID" />
 
+				<NcSelect v-bind="sourceTargetMappingOptions"
+					v-model="sourceTargetMappingOptions.hashValue"
+					:loading="sourceTargetMappingLoading"
+					input-label="Source hash mapping" />
+
 				<NcSelect v-bind="sourceTargetMappingOptions"
 					v-model="sourceTargetMappingOptions.sourceValue"
 					:loading="sourceTargetMappingLoading"
-					input-label="sourceTargetMapping" />
+					input-label="Source target mapping" />
 
 				<NcTextField :value.sync="synchronizationItem.sourceConfig.idPosition"
 					label="(optional) Position of id in source object" />
@@ -135,7 +140,7 @@ import { synchronizationStore, navigationStore, sourceStore, mappingStore } from
 				<NcSelect v-bind="sourceTargetMappingOptions"
 					v-model="sourceTargetMappingOptions.targetValue"
 					:loading="sourceTargetMappingLoading"
-					input-label="targetSourceMapping" />
+					input-label="Target source mapping" />
 			</form>
 
 			<NcButton v-if="!success"
@@ -208,6 +213,7 @@ export default {
 					headers: {},
 					query: {},
 				},
+				sourceHashMapping: '',
 				sourceTargetMapping: '',
 				targetId: '',
 				targetType: 'register/schema',
@@ -234,6 +240,7 @@ export default {
 			sourceTargetMappingLoading: false, // Indicates if the mappings are loading
 			sourceTargetMappingOptions: { // A list of mappings
 				options: [],
+				hashValue: null,
 				sourceValue: null,
 				targetValue: null,
 			},
@@ -340,12 +347,19 @@ export default {
 				.then(({ entities }) => {
 					const activeSourceMapping = entities.find(mapping => mapping.id.toString() === this.synchronizationItem.sourceTargetMapping.toString())
 					const activeTargetMapping = entities.find(mapping => mapping.id.toString() === this.synchronizationItem.targetSourceMapping.toString())
+					const sourceHashMapping = entities.find(mapping => mapping.id.toString() === this.synchronizationItem.sourceHashMapping.toString())
 
 					this.sourceTargetMappingOptions = {
 						options: entities.map(mapping => ({
 							label: mapping.name,
 							id: mapping.id,
 						})),
+						hashValue: sourceHashMapping
+							? {
+								label: sourceHashMapping.name,
+								id: sourceHashMapping.id,
+							}
+							: null,
 						sourceValue: activeSourceMapping
 							? {
 								label: activeSourceMapping.name,
@@ -528,6 +542,7 @@ export default {
 				...this.synchronizationItem,
 				sourceId: this.sourceOptions.sourceValue?.id || null,
 				sourceType: this.typeOptions.value?.id || null,
+				sourceHashMapping: this.sourceTargetMappingOptions.hashValue?.id || null,
 				sourceTargetMapping: this.sourceTargetMappingOptions.sourceValue?.id || null,
 				targetType: this.targetTypeOptions.value?.id || null,
 				targetId: targetId || null,

src/views/Synchronization/SynchronizationDetails.vue

@@ -88,6 +88,10 @@ import { synchronizationStore, navigationStore, logStore } from '../../store/sto
 						<b>Source Hash:</b>
 						<p>{{ synchronizationStore.synchronizationItem.sourceHash || 'N/A' }}</p>
 					</div>
+					<div class="gridContent gridFullWidth">
+						<b>Source Hash mapping id:</b>
+						<p>{{ synchronizationStore.synchronizationItem.sourceHashMapping || 'N/A' }}</p>
+					</div>
 					<div class="gridContent gridFullWidth">
 						<b>Source Last Changed:</b>
 						<p>{{ synchronizationStore.synchronizationItem.sourceLastChanged || 'N/A' }}</p>