rename variable to storageOption

Author: ethanzhouyc

src-electron/rest/user-data.js

@@ -115,7 +115,7 @@ function httpPostCheckConformOnFeatureUpdate(db) {
       clusterFeatures,
       endpointId,
       endpointTypeId,
-      featureMapStorageOption,
+      storageOption,
       changeConfirmed
     } = request.body
 
@@ -137,7 +137,7 @@ function httpPostCheckConformOnFeatureUpdate(db) {
       featureData,
       endpointId,
       clusterFeatures,
-      featureMapStorageOption
+      storageOption
     )
 
     if (changeConfirmed || result.disableChange) {

src-electron/validation/conformance-checker.js

@@ -51,7 +51,7 @@ function generateWarningMessage(
   descElements = {},
   featuresToUpdate = {},
   changedConformFeatures = [],
-  featureMapStorageOption = null,
+  storageOption = null,
   attributes = []
 ) {
   // feature change is disabled by default before the checks
@@ -75,7 +75,7 @@ function generateWarningMessage(
   let updateDisabledString = `cannot be ${added ? 'enabled' : 'disabled'} as`
 
   // Check 0: if the featureMap attribute storage is external, ZAP cannot modify it
-  if (featureMapStorageOption === dbEnum.storageOption.external) {
+  if (storageOption === dbEnum.storageOption.external) {
     result.warningMessage.push(
       warningPrefix +
         ` ${updateDisabledString} the featureMap attribute in the cluster is external and ZAP does not have control over it.`
@@ -282,7 +282,7 @@ function checkElementConformance(
   featureData = null,
   endpointId = null,
   clusterFeatures = null,
-  featureMapStorageOption = null
+  storageOption = null
 ) {
   let { attributes, commands, events } = elements
   let featureCode = featureData ? featureData.code : ''
@@ -338,7 +338,7 @@ function checkElementConformance(
       descElements,
       featuresToUpdate,
       changedConformFeatures,
-      featureMapStorageOption,
+      storageOption,
       attributes
     )
 

src/util/feature-mixin.js

@@ -117,7 +117,7 @@ export default {
         clusterFeatures: this.clusterFeatures,
         endpointId: this.endpointId[this.selectedEndpointId],
         endpointTypeId: this.selectedEndpointTypeId,
-        featureMapStorageOption: this.featureMapAttribute?.storageOption,
+        storageOption: this.featureMapAttribute?.storageOption,
         changeConfirmed: false
       }).then((res) => {
         // store backend response and frontend data for reuse if updates are confirmed
@@ -229,7 +229,7 @@ export default {
         clusterFeatures: this.clusterFeatures,
         endpointId: this.endpointId[this.selectedEndpointId],
         endpointTypeId: this.selectedEndpointTypeId,
-        featureMapStorageOption: this.featureMapAttribute?.storageOption,
+        storageOption: this.featureMapAttribute?.storageOption,
         changeConfirmed: true
       })
       if (this.displayWarning) {