Fix [Function panel] Cannot edit single secret value (#833)

mlrun · Oct 2, 2021 · b047c3a · b047c3a
1 parent 8f73de9
commit b047c3a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/src/common/KeyValueTable/KeyValueTableView.js b/src/common/KeyValueTable/KeyValueTableView.js
@@ -50,7 +50,7 @@ const KeyValueTableView = ({
         <div className="table-cell table-cell__actions" />
       </div>
       {content.map((contentItem, index) => {
-        return isEditMode && contentItem.key === selectedItem.key ? (
+        return isEditMode && index === selectedItem.index ? (
           <div className="table-row table-row_edit" key={index}>
             <div className="table-cell table-cell__key">
               {keyType === 'select' ? (
@@ -59,7 +59,8 @@ const KeyValueTableView = ({
                   onClick={key =>
                     setSelectedItem({
                       ...selectedItem,
-                      newKey: key
+                      newKey: key,
+                      index
                     })
                   }
                   options={keyOptions}
@@ -82,7 +83,8 @@ const KeyValueTableView = ({
                   onChange={key =>
                     setSelectedItem({
                       ...selectedItem,
-                      newKey: key
+                      newKey: key,
+                      index
                     })
                   }
                   required={isKeyRequired}
@@ -105,7 +107,8 @@ const KeyValueTableView = ({
                 onChange={value =>
                   setSelectedItem({
                     ...selectedItem,
-                    value
+                    value,
+                    index
                   })
                 }
                 required={isValueRequired}
@@ -142,7 +145,7 @@ const KeyValueTableView = ({
             key={index}
             onClick={() => {
               if (withEditMode) {
-                setSelectedItem(contentItem)
+                setSelectedItem({ ...contentItem, index })
                 setEditMode(true)
                 setValidation({
                   isKeyValid: true,
@@ -170,7 +173,8 @@ const KeyValueTableView = ({
             <div className="table-cell table-cell__actions">
               <button
                 className="key-value-table__btn"
-                onClick={() => {
+                onClick={event => {
+                  event.stopPropagation()
                   deleteItem(index, contentItem)
                 }}
               >

diff --git a/src/common/Select/Select.js b/src/common/Select/Select.js
@@ -41,6 +41,7 @@ const Select = ({
     `select-${density}`,
     isOpen && 'select_active',
     withoutBorder && 'without-border',
+    label.length === 0 && 'without-label',
     disabled && 'disabled'
   )
   const selectLabelClassName = classNames(

diff --git a/src/common/Select/select.scss b/src/common/Select/select.scss
@@ -25,17 +25,23 @@
     transform: translate(0%, -50%);
   }
 
-  &.without-border {
-    border: none;
-
-    .select__caret {
-      display: none;
-    }
+  &.without {
+    &-border {
+      border: none;
 
-    &:hover {
       .select__caret {
-        display: block;
+        display: none;
       }
+
+      &:hover {
+        .select__caret {
+          display: block;
+        }
+      }
+    }
+
+    &-label {
+      padding-left: 16px;
     }
   }
 

diff --git a/src/elements/FunctionsPanelSecrets/FunctionsPanelSecrets.js b/src/elements/FunctionsPanelSecrets/FunctionsPanelSecrets.js
@@ -25,8 +25,8 @@ const FunctionsPanelSecrets = ({
   const handleEditSecretSource = useCallback(
     secretSource => {
       setNewFunctionSecretSources(
-        functionsStore.newFunction.spec.secret_sources.map(item => {
-          if (item.kind === secretSource.key) {
+        functionsStore.newFunction.spec.secret_sources.map((item, index) => {
+          if (index === secretSource.index) {
             item.kind = secretSource.newKey || secretSource.key
             item.source = secretSource.value
           }