1 files changed, 186 insertions, 189 deletions
diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js b/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js
index f7f6d4195e..b82d08683f 100644
--- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js
+++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js
@@ -17,208 +17,205 @@
 import keyMirror from 'nfvo-utils/KeyMirror.js';
 
 export const actionTypes = keyMirror({
-	LOAD_CONFLICTS: null,
-	ADD_ACTIONS: null,
-	LOAD_CONFLICT: null,
-	DATA_PROCESSED: null
+    LOAD_CONFLICTS: null,
+    ADD_ACTIONS: null,
+    LOAD_CONFLICT: null,
+    DATA_PROCESSED: null
 });
 
 export const rules = {
-	SKIP: 'skip',
-	PARSE: 'parse',
-	FUNCTION: 'function',
-	BOOLEAN: 'boolean'
+    SKIP: 'skip',
+    PARSE: 'parse',
+    FUNCTION: 'function',
+    BOOLEAN: 'boolean'
 };
 
 export const SyncStates = {
-	MERGE : 'Merging',
-	OUT_OF_SYNC: 'OutOfSync',
-	UP_TO_DATE: 'UpToDate'
+    MERGE: 'Merging',
+    OUT_OF_SYNC: 'OutOfSync',
+    UP_TO_DATE: 'UpToDate'
 };
 
 export const ResolutionTypes = {
-	YOURS: 'YOURS',
-	THEIRS: 'THEIRS'
+    YOURS: 'YOURS',
+    THEIRS: 'THEIRS'
 };
 
 export const fileTypes = {
-	LKG : 'LicenseKeyGroup',
-	VLM : 'VendorLicenseModel',
-	EP  : 'EntitlementPool',
-	FG  : 'FeatureGroup',
-	LA  : 'LicenseAgreement',
-	VSP : 'VendorSoftwareProduct',
-	LIMIT : 'Limit',
-	VSP_Q : 'VSPQuestionnaire',
-	COMPONENT : 'Component',
-	COMPONENT_Q : 'ComponentQuestionnaire',
-	COMPONENT_DEP : 'ComponentDependencies',
-	COMPUTE_Q : 'ComputeQuestionnaire',
-	COMPUTE : 'Compute',
-	COMPUTE_FLAVOR: 'ComputeFlavor',
-	NIC : 'Nic',
-	NIC_Q : 'NicQuestionnaire',
-	IMAGE : 'Image',
-	IMAGE_Q : 'ImageQuestionnaire',
-	PROCESS : 'Process',
-	DEPLOYMENT_FLAVOR : 'DeploymentFlavor',
-	VENDOR : 'Vendor',
-	NETWORK : 'Network',
-	ORCHESTRATION_TEMPLATE_CANDIDATE : 'OrchestrationTemplateCandidate'
+    LKG: 'LicenseKeyGroup',
+    VLM: 'VendorLicenseModel',
+    EP: 'EntitlementPool',
+    FG: 'FeatureGroup',
+    LA: 'LicenseAgreement',
+    VSP: 'VendorSoftwareProduct',
+    LIMIT: 'Limit',
+    VSP_Q: 'VSPQuestionnaire',
+    COMPONENT: 'Component',
+    COMPONENT_Q: 'ComponentQuestionnaire',
+    COMPONENT_DEP: 'ComponentDependencies',
+    COMPUTE_Q: 'ComputeQuestionnaire',
+    COMPUTE: 'Compute',
+    COMPUTE_FLAVOR: 'ComputeFlavor',
+    NIC: 'Nic',
+    NIC_Q: 'NicQuestionnaire',
+    IMAGE: 'Image',
+    IMAGE_Q: 'ImageQuestionnaire',
+    PROCESS: 'Process',
+    DEPLOYMENT_FLAVOR: 'DeploymentFlavor',
+    VENDOR: 'Vendor',
+    NETWORK: 'Network',
+    ORCHESTRATION_TEMPLATE_CANDIDATE: 'OrchestrationTemplateCandidate'
 };
 
 export const dataRules = {
-	general: {
-		id: {
-			rule: rules.SKIP
-		},
-		questionareData: {
-			rule: rules.PARSE,
-			moveFields: true
-		},
-		startDate: {
-			rule: rules.FUNCTION,
-			functionName: 'parseDate'
-		},
-		expiryDate: {
-			rule: rules.FUNCTION,
-			functionName: 'parseDate'
-		},
-		featureGroups: {
-			rule: rules.FUNCTION,
-			functionName: 'reduceList',
-			args: {subField: 'name'}
-		},
-		licenseKeyGroups: {
-			rule: rules.FUNCTION,
-			functionName: 'reduceList',
-			args: {subField: 'name'}
-		},
-		entitlementPools: {
-			rule: rules.FUNCTION,
-			functionName: 'reduceList',
-			args: {subField: 'name'}
-		},
-	},
-	[fileTypes.COMPONENT] : {
-	},
-	[fileTypes.COMPUTE_FLAVOR] : {
-		associatedToDeploymentFlavor: {
-			rule: rules.BOOLEAN,
-			trueValue: 'true'
-		}
-	},
-	[fileTypes.COMPUTE_Q] : {
-	},
-	[fileTypes.COMPONENT_Q] : {
-		isComponentMandatory: {
-			rule: rules.BOOLEAN,
-			trueValue: 'YES',
-			falseValue: 'NO'
-		}
-	},
-	[fileTypes.EP] : {
-		referencingFeatureGroups: {
-			rule: rules.SKIP,
-			functionName: 'getFeatureGroups'
-		},
-		operationalScope: {
-			rule: rules.FUNCTION,
-			functionName: 'processChoices'
-		},
-	},
-	[fileTypes.FG] : {
-		referencingLicenseAgreements: {
-			rule: rules.SKIP,
-			functionName: 'getLicenseAgreements'
-		}
-	},
-	[fileTypes.LA] : {
-		licenseTerm : {
-			rule: rules.FUNCTION,
-			functionName: 'processChoice'
-		}
-	},
-	[fileTypes.LIMIT] : {
-		type: {
-			rule: rules.FUNCTION,
-			functionName: 'getEnumValue',
-			args: {listName: 'limitType'}
-		},
-		unit: {
-			rule: rules.FUNCTION,
-			functionName: 'getEnumValue',
-			args: {listName: 'limitUnit'}
-		}
-	},
-	[fileTypes.LKG] : {
-		operationalScope: {
-			rule: rules.FUNCTION,
-			functionName: 'processChoices'
-		},
-		referencingFeatureGroups: {
-			rule: rules.SKIP,
-			functionName: 'getFeatureGroups'
-		},
-	},
-	[fileTypes.NIC] : {
-		networkId: {
-			rule: rules.SKIP
-		}
-	},
-	[fileTypes.NIC_Q] : {
-	},
-	[fileTypes.PROCESS] : {
-		type: {
-			rule: rules.FUNCTION,
-			functionName: 'getEnumValue',
-			args: {listName: 'processType'}
-		}
-	},
-	[fileTypes.VLM] : {
-		iconRef: {
-			rule: rules.SKIP
-		}
-	},
-	[fileTypes.VSP] : {
-		vendorId: {
-			rule: rules.SKIP
-		},
-		onboardingMethod: {
-			rule: rules.SKIP
-		},
-		validationData: {
-			rule: rules.SKIP
-		},
-		isOldVersion: {
-			rule: rules.SKIP
-		},
-		licensingVersion: {
-			rule: rules.FUNCTION,
-			functionName: 'fetchLMVersion'
-		},
-		category: {
-			rule: rules.FUNCTION,
-			functionName: 'fetchCategory'
-		},
-		subCategory: {
-			rule: rules.SKIP
-		},
-	},
-	[fileTypes.VSP_Q] : {
-		affinityData: {
-			rule: rules.SKIP
-		},
-		storageReplicationAcrossRegion: {
-			rule: rules.BOOLEAN,
-			trueValue: 'true',
-			falseValue: 'false'
-		}
-	},
-	[fileTypes.ORCHESTRATION_TEMPLATE_CANDIDATE] : {
-		modules: {
-			rule: rules.FUNCTION,
-			functionName: 'convertArrayToObject'
-		},
-	},
+    general: {
+        id: {
+            rule: rules.SKIP
+        },
+        questionareData: {
+            rule: rules.PARSE,
+            moveFields: true
+        },
+        startDate: {
+            rule: rules.FUNCTION,
+            functionName: 'parseDate'
+        },
+        expiryDate: {
+            rule: rules.FUNCTION,
+            functionName: 'parseDate'
+        },
+        featureGroups: {
+            rule: rules.FUNCTION,
+            functionName: 'reduceList',
+            args: { subField: 'name' }
+        },
+        licenseKeyGroups: {
+            rule: rules.FUNCTION,
+            functionName: 'reduceList',
+            args: { subField: 'name' }
+        },
+        entitlementPools: {
+            rule: rules.FUNCTION,
+            functionName: 'reduceList',
+            args: { subField: 'name' }
+        }
+    },
+    [fileTypes.COMPONENT]: {},
+    [fileTypes.COMPUTE_FLAVOR]: {
+        associatedToDeploymentFlavor: {
+            rule: rules.BOOLEAN,
+            trueValue: 'true'
+        }
+    },
+    [fileTypes.COMPUTE_Q]: {},
+    [fileTypes.COMPONENT_Q]: {
+        isComponentMandatory: {
+            rule: rules.BOOLEAN,
+            trueValue: 'YES',
+            falseValue: 'NO'
+        }
+    },
+    [fileTypes.EP]: {
+        referencingFeatureGroups: {
+            rule: rules.SKIP,
+            functionName: 'getFeatureGroups'
+        },
+        operationalScope: {
+            rule: rules.FUNCTION,
+            functionName: 'processChoices'
+        }
+    },
+    [fileTypes.FG]: {
+        referencingLicenseAgreements: {
+            rule: rules.SKIP,
+            functionName: 'getLicenseAgreements'
+        }
+    },
+    [fileTypes.LA]: {
+        licenseTerm: {
+            rule: rules.FUNCTION,
+            functionName: 'processChoice'
+        }
+    },
+    [fileTypes.LIMIT]: {
+        type: {
+            rule: rules.FUNCTION,
+            functionName: 'getEnumValue',
+            args: { listName: 'limitType' }
+        },
+        unit: {
+            rule: rules.FUNCTION,
+            functionName: 'getEnumValue',
+            args: { listName: 'limitUnit' }
+        }
+    },
+    [fileTypes.LKG]: {
+        operationalScope: {
+            rule: rules.FUNCTION,
+            functionName: 'processChoices'
+        },
+        referencingFeatureGroups: {
+            rule: rules.SKIP,
+            functionName: 'getFeatureGroups'
+        }
+    },
+    [fileTypes.NIC]: {
+        networkId: {
+            rule: rules.SKIP
+        }
+    },
+    [fileTypes.NIC_Q]: {},
+    [fileTypes.PROCESS]: {
+        type: {
+            rule: rules.FUNCTION,
+            functionName: 'getEnumValue',
+            args: { listName: 'processType' }
+        }
+    },
+    [fileTypes.VLM]: {
+        iconRef: {
+            rule: rules.SKIP
+        }
+    },
+    [fileTypes.VSP]: {
+        vendorId: {
+            rule: rules.SKIP
+        },
+        onboardingMethod: {
+            rule: rules.SKIP
+        },
+        validationData: {
+            rule: rules.SKIP
+        },
+        isOldVersion: {
+            rule: rules.SKIP
+        },
+        licensingVersion: {
+            rule: rules.FUNCTION,
+            functionName: 'fetchLMVersion'
+        },
+        category: {
+            rule: rules.FUNCTION,
+            functionName: 'fetchCategory'
+        },
+        subCategory: {
+            rule: rules.SKIP
+        }
+    },
+    [fileTypes.VSP_Q]: {
+        affinityData: {
+            rule: rules.SKIP
+        },
+        storageReplicationAcrossRegion: {
+            rule: rules.BOOLEAN,
+            trueValue: 'true',
+            falseValue: 'false'
+        }
+    },
+    [fileTypes.ORCHESTRATION_TEMPLATE_CANDIDATE]: {
+        modules: {
+            rule: rules.FUNCTION,
+            functionName: 'convertArrayToObject'
+        }
+    }
 };