Fix Config-Server UI (#1636)

* fix mapping-editor * fix buttons * fix methodConfigurationEditor
inspectIT · Dec 22, 2023 · 986a6bb · 986a6bb
1 parent b792206
commit 986a6bb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/...ts/inspectit-ocelot-configurationserver-ui/src/components/common/dialogs/ConvertDialog.js b/...ts/inspectit-ocelot-configurationserver-ui/src/components/common/dialogs/ConvertDialog.js
@@ -10,7 +10,7 @@ const ConvertDialog = ({ name, visible, onHide, text, onSuccess }) => {
   const proceedButton = React.createRef();
 
   useEffect(() => {
-    if (proceedButton && proceedButton.current) {
+    if (proceedButton?.current?.element) {
       proceedButton.current.element.focus();
     }
   });

diff --git a/...nserver-ui/src/components/editor/method-configuration-editor/MethodConfigurationEditor.js b/...nserver-ui/src/components/editor/method-configuration-editor/MethodConfigurationEditor.js
@@ -74,17 +74,6 @@ const MethodConfigurationEditor = ({ yamlConfiguration }) => {
       };
     });
     setScopes(currentScopes);
-
-    // expand all rows by default
-    const initialExpandedRows = _.reduce(
-      currentScopes,
-      (result, { typeKey }) => {
-        result[typeKey] = true;
-        return result;
-      },
-      {}
-    );
-    setExpandedRows(initialExpandedRows);
   }, [configuration]);
 
   /**
@@ -337,7 +326,7 @@ const MethodConfigurationEditor = ({ yamlConfiguration }) => {
               dataKey="typeKey"
               sortField="typeKey"
               sortOrder={1}
-              groupField="typeKey"
+              groupRowsBy="typeKey"
               expandableRowGroups={true}
               expandedRows={expandedRows}
               onRowToggle={(e) => setExpandedRows(e.data)}

diff --git a/...tit-ocelot-configurationserver-ui/src/components/views/configuration/ConfigurationView.js b/...tit-ocelot-configurationserver-ui/src/components/views/configuration/ConfigurationView.js
@@ -292,6 +292,7 @@ class ConfigurationView extends React.Component {
         <DownloadDialogue
           visible={this.state.isConfigurationDialogShown}
           onHide={this.hideConfigurationDialog}
+          onCancel={this.hideConfigurationDialog}
           loading={this.props.loading}
           contentValue={fileContentWithoutFirstLine}
           contentType={'config'}

diff --git a/...ts/inspectit-ocelot-configurationserver-ui/src/components/views/configuration/FileTree.js b/...ts/inspectit-ocelot-configurationserver-ui/src/components/views/configuration/FileTree.js
@@ -88,7 +88,9 @@ class FileTree extends React.Component {
       event.originalEvent.stopPropagation();
       return;
     }
-    event.originalEvent.persist();
+    if (event.originalEvent) {
+      event.originalEvent.persist();
+    }
     this.setState({ contextMenuModel: this.getContextMenuModel(newSelection) });
     this.contextMenuRef.current.show(event.originalEvent || event);
   };

diff --git a/...lot-configurationserver-ui/src/components/views/mappings/editComponents/KeyValueEditor.js b/...lot-configurationserver-ui/src/components/views/mappings/editComponents/KeyValueEditor.js
@@ -11,7 +11,7 @@ class KeyValueEditor extends React.Component {
   editor = (columnProps) => {
     return (
       <InputText
-        value={columnProps.rowData[columnProps.field]}
+        defaultValue={columnProps.rowData[columnProps.field]}
         onChange={(e) => this.valueChanged(columnProps.rowIndex, columnProps.field, e.target.value)}
       />
     );