Fix group management

BrunoQuaresma · BrunoQuaresma · commit d8ad09feccdd · 2022-10-06T20:26:15.000Z
diff --git a/license.txt b/license.txt
@@ -0,0 +1 @@
+eyJhbGciOiJFZERTQSIsImtpZCI6IjIwMjItMDgtMTIiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJtYWNoaW5lQGNvZGVyLmNvbSIsImV4cCI6MTY3MTQ3OTgyOCwibmJmIjoxNjY1MDg2MjI1LCJpYXQiOjE2NjUwODYyMzQsImxpY2Vuc2VfZXhwaXJlcyI6MTY3MDI3MDIyOCwiYWNjb3VudF90eXBlIjoic2FsZXNmb3JjZSIsImFjY291bnRfaWQiOiIwMDExVTAwMDAxTWVQaW9RQUYiLCJ0cmlhbCI6ZmFsc2UsInZlcnNpb24iOjMsImZlYXR1cmVzIjp7InVzZXJfbGltaXQiOjAsImF1ZGl0X2xvZyI6MSwiYnJvd3Nlcl9vbmx5IjoxLCJzY2ltIjoxLCJ3b3Jrc3BhY2VfcXVvdGEiOjEsInJiYWMiOjF9fQ.wCVLOmifUVXvyq8Wos7iS6vN0GilIaaAOQhEMnsrkyGCE57jNC46KH1kHdJf8l6ZduxgJC7blHqRCkigJz-GDw
diff --git a/site/src/components/UserAutocomplete/UserAutocomplete.tsx b/site/src/components/UserAutocomplete/UserAutocomplete.tsx
@@ -156,6 +156,10 @@ export const useInlineStyle = makeStyles(() => {
     inline: {
       width: "300px",
 
+      "& .MuiFormControl-root": {
+        margin: 0,
+      },
+
       "& .MuiInputBase-root": {
         // Match button small height
         height: 36,
diff --git a/site/src/pages/GroupsPage/GroupPage.tsx b/site/src/pages/GroupsPage/GroupPage.tsx
@@ -91,6 +91,7 @@ export const GroupPage: React.FC = () => {
   const { group, permissions } = state.context
   const isLoading = group === undefined || permissions === undefined
   const canUpdateGroup = permissions ? permissions.canUpdateGroup : false
+  console.log(state.value)
 
   return (
     <>
diff --git a/site/src/xServices/groups/groupXService.ts b/site/src/xServices/groups/groupXService.ts
@@ -59,24 +59,42 @@ export const groupMachine = createMachine(
         type: "parallel",
         states: {
           data: {
-            invoke: {
-              src: "loadGroup",
-              onDone: {
-                actions: ["assignGroup"],
+            initial: "loading",
+            states: {
+              loading: {
+                invoke: {
+                  src: "loadGroup",
+                  onDone: {
+                    actions: ["assignGroup"],
+                    target: "success",
+                  },
+                  onError: {
+                    actions: ["displayLoadGroupError"],
+                  },
+                },
               },
-              onError: {
-                actions: ["displayLoadGroupError"],
+              success: {
+                type: "final",
               },
             },
           },
           permissions: {
-            invoke: {
-              src: "loadPermissions",
-              onDone: {
-                actions: ["assignPermissions"],
+            initial: "loading",
+            states: {
+              loading: {
+                invoke: {
+                  src: "loadPermissions",
+                  onDone: {
+                    actions: ["assignPermissions"],
+                    target: "success",
+                  },
+                  onError: {
+                    actions: ["displayLoadPermissionsError"],
+                  },
+                },
               },
-              onError: {
-                actions: ["displayLoadPermissionsError"],
+              success: {
+                type: "final",
               },
             },
           },

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+eyJhbGciOiJFZERTQSIsImtpZCI6IjIwMjItMDgtMTIiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJtYWNoaW5lQGNvZGVyLmNvbSIsImV4cCI6MTY3MTQ3OTgyOCwibmJmIjoxNjY1MDg2MjI1LCJpYXQiOjE2NjUwODYyMzQsImxpY2Vuc2VfZXhwaXJlcyI6MTY3MDI3MDIyOCwiYWNjb3VudF90eXBlIjoic2FsZXNmb3JjZSIsImFjY291bnRfaWQiOiIwMDExVTAwMDAxTWVQaW9RQUYiLCJ0cmlhbCI6ZmFsc2UsInZlcnNpb24iOjMsImZlYXR1cmVzIjp7InVzZXJfbGltaXQiOjAsImF1ZGl0X2xvZyI6MSwiYnJvd3Nlcl9vbmx5IjoxLCJzY2ltIjoxLCJ3b3Jrc3BhY2VfcXVvdGEiOjEsInJiYWMiOjF9fQ.wCVLOmifUVXvyq8Wos7iS6vN0GilIaaAOQhEMnsrkyGCE57jNC46KH1kHdJf8l6ZduxgJC7blHqRCkigJz-GDw