Merge pull request #168 from mercedes-benz/VULCAN-011/MergeConflict

Vulcan 011/merge conflict
mercedes-benz · Dec 12, 2024 · 4a22eb3 · 4a22eb3
2 parents 65fd3bd + 4273fe7
commit 4a22eb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -144,5 +144,6 @@
     "webpack": "^5.77.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.7.3"
-  }
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/src/chart/parameter/component/NodePropertyParameterSelect.tsx b/src/chart/parameter/component/NodePropertyParameterSelect.tsx
@@ -159,11 +159,7 @@ const NodePropertyParameterSelectComponent = (props: ParameterSelectProps) => {
 
   // The query used to populate the selector is invalid.
   if (extraRecords && extraRecords[0] && extraRecords[0].error) {
-    return (
-      <NeoCodeViewerComponent
-        value={`The parameter value retrieval query is invalid: \n${props.query}\n\nError message:\n${extraRecords[0].error}`}
-      />
-    );
+    return <NeoCodeViewerComponent value={`Please reload page`} />;
   }
   let options = extraRecords?.map((r) => r?._fields?.[displayValueRowIndex] || '(no data)');
   options = props.autoSort ? options.sort() : options;