fix(datasetattributes, mapper): fix refactoring

coherence in choices + fix to have exact same behavior

Author: joannacirillo

Sources/Common/DataModel/DataSetAttributes/FieldData.js

@@ -197,14 +197,13 @@ export function extend(publicAPI, model, initialValues = {}) {
 
   macro.obj(publicAPI, model);
 
-  vtkFieldData(publicAPI, model);
-
   // Decode serialized data if any
   if (initialValues.arrays) {
     initialValues.arrays = initialValues.arrays.map((item) => ({
       data: vtk(item.data),
     }));
   }
+  vtkFieldData(publicAPI, model);
 }
 
 // ----------------------------------------------------------------------------

Sources/Rendering/Core/Mapper/index.js

@@ -600,7 +600,7 @@ function defaultValues(initialValues) {
     useInvertibleColors: false,
     invertibleScalars: null,
 
-    viewSpecificProperties: null,
+    viewSpecificProperties: {},
 
     customShaderAttributes: [],
     ...initialValues,
@@ -639,10 +639,6 @@ export function extend(publicAPI, model, initialValues = {}) {
   ]);
   macro.setGetArray(publicAPI, model, ['scalarRange'], 2);
 
-  if (!initialValues.viewSpecificProperties) {
-    initialValues.viewSpecificProperties = {};
-  }
-
   CoincidentTopologyHelper.implementCoincidentTopologyMethods(publicAPI, model);
 
   // Object methods