Fix for setting enabled correctly for group settings (#2)

opendatahub-io · Jul 15, 2024 · ba55a53 · ba55a53
1 parent 3d1d41a
commit ba55a53
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/frontend/src/components/MultiSelection.tsx b/frontend/src/components/MultiSelection.tsx
@@ -41,6 +41,7 @@ export const MultiSelection: React.FC<MultiSelectionProps> = ({ value, setValue
     [inputValue, value],
   );
 
+  console.log(`Value: `, value);
   React.useEffect(() => {
     if (inputValue) {
       setIsOpen(true);
@@ -112,10 +113,11 @@ export const MultiSelection: React.FC<MultiSelectionProps> = ({ value, setValue
   };
   const onSelect = (menuItem?: SelectionOptions) => {
     if (menuItem) {
+      console.log(`Selected: `, menuItem.name);
       setValue(
         selected.includes(menuItem)
-          ? value.map((option) => (option === menuItem ? { ...option, enabled: false } : option))
-          : value.map((option) => (option === menuItem ? { ...option, enabled: true } : option)),
+          ? value.map((option) => (option === menuItem ? { ...option, selected: false } : option))
+          : value.map((option) => (option === menuItem ? { ...option, selected: true } : option)),
       );
     }
     textInputRef.current?.focus();
@@ -165,7 +167,7 @@ export const MultiSelection: React.FC<MultiSelectionProps> = ({ value, setValue
               variant="plain"
               onClick={() => {
                 setInputValue('');
-                setValue(value.map((option) => ({ ...option, enabled: false })));
+                setValue(value.map((option) => ({ ...option, selected: false })));
                 textInputRef.current?.focus();
               }}
               aria-label="Clear input value"

diff --git a/frontend/src/pages/groupSettings/GroupSettings.tsx b/frontend/src/pages/groupSettings/GroupSettings.tsx
@@ -92,7 +92,11 @@ const GroupSettings: React.FC = () => {
           >
             <MultiSelection
               ariaLabel={adminDesc}
-              value={groupSettings.adminGroups}
+              value={groupSettings.adminGroups.map((g) => ({
+                id: g.id,
+                name: g.name,
+                selected: g.enabled,
+              }))}
               setValue={(newState) => handleMenuItemSelection(newState, GroupsConfigField.ADMIN)}
             />
             {groupSettings.errorAdmin ? (
@@ -125,7 +129,11 @@ const GroupSettings: React.FC = () => {
           >
             <MultiSelection
               ariaLabel={userDesc}
-              value={groupSettings.allowedGroups}
+              value={groupSettings.allowedGroups.map((g) => ({
+                id: g.id,
+                name: g.name,
+                selected: g.enabled,
+              }))}
               setValue={(newState) => handleMenuItemSelection(newState, GroupsConfigField.USER)}
             />
             {groupSettings.errorUser ? (