Added validation to prevent making group inactive if the group has ac…

…tive roles (thewca#9697) * Added validation to prevent making group inactive if the group has active roles * Review chnages
danieljames-dj · Jul 22, 2024 · 7d546f6 · 7d546f6
1 parent 276635e
commit 7d546f6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/app/models/user_group.rb b/app/models/user_group.rb
@@ -35,6 +35,8 @@ class UserGroup < ApplicationRecord
   scope :root_groups, -> { where(parent_group: nil) }
   scope :active_groups, -> { where(is_active: true) }
 
+  validates :active_roles, absence: true, unless: :is_active?
+
   def all_child_groups
     [direct_child_groups, direct_child_groups.map(&:all_child_groups)].flatten
   end

diff --git a/app/webpacker/components/Panel/pages/RegionManager/index.jsx b/app/webpacker/components/Panel/pages/RegionManager/index.jsx
@@ -22,7 +22,9 @@ const defaultRegion = {
   friendlyId: '',
 };
 
-function UserGroupVisibility({ userGroup, save, sync }) {
+function UserGroupVisibility({
+  userGroup, save, sync, setSaveError,
+}) {
   const [open, setOpen] = React.useState(false);
   const iconName = userGroup.is_active ? 'eye' : 'eye slash';
   return (
@@ -42,6 +44,8 @@ function UserGroupVisibility({ userGroup, save, sync }) {
             userGroupsUpdateUrl(userGroup.id),
             { is_active: !userGroup.is_active, is_hidden: userGroup.is_hidden },
             sync,
+            {},
+            setSaveError,
           );
         }}
       />
@@ -76,7 +80,7 @@ export default function RegionManager() {
   }, [data]);
 
   if (loading || fetchLoading || saving) return <Loading />;
-  if (error || saveError) return <Errored />;
+  if (error || saveError) return <Errored error={error || saveError} />;
 
   return (
     <>
@@ -123,7 +127,12 @@ export default function RegionManager() {
                 <Table.Cell />
                 <Table.Cell />
                 <Table.Cell>
-                  <UserGroupVisibility userGroup={region} save={save} sync={sync} />
+                  <UserGroupVisibility
+                    userGroup={region}
+                    save={save}
+                    sync={sync}
+                    setSaveError={setSaveError}
+                  />
                 </Table.Cell>
               </Table.Row>
               {subRegions[region.id]?.map((subRegion) => (
@@ -153,7 +162,12 @@ export default function RegionManager() {
                       )}
                   </Table.Cell>
                   <Table.Cell>
-                    <UserGroupVisibility userGroup={subRegion} save={save} sync={sync} />
+                    <UserGroupVisibility
+                      userGroup={subRegion}
+                      save={save}
+                      sync={sync}
+                      setSaveError={setSaveError}
+                    />
                   </Table.Cell>
                 </Table.Row>
               ))}