UI fixes

kloudlite · Jan 14, 2024 · a8166f7 · a8166f7
1 parent b65da32
commit a8166f7
Show file tree

Hide file tree

Showing 28 changed files with 1,617 additions and 804 deletions.
diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
@@ -908,6 +908,16 @@ mutation consoleUpdateApp($projectName: String!, $envName: String!, $app: AppIn!
   }
 }
 
+mutation consoleInterceptApp($projectName: String!, $envName: String!, $appname: String!, $deviceName: String!, $intercept: Boolean!) {
+  core_interceptApp(
+    projectName: $projectName
+    envName: $envName
+    appname: $appname
+    deviceName: $deviceName
+    intercept: $intercept
+  )
+}
+
 mutation consoleDeleteApp($projectName: String!, $envName: String!, $appName: String!) {
   core_deleteApp(projectName: $projectName, envName: $envName, appName: $appName)
 }
@@ -1065,19 +1075,19 @@ query consoleListApps($projectName: String!, $envName: String!, $search: SearchA
         displayName
         enabled
         environmentName
-        kind
         lastUpdatedBy {
           userEmail
           userId
           userName
         }
         markedForDeletion
         metadata {
-          annotations
+          generation
           name
           namespace
         }
         projectName
+        recordVersion
         spec {
           containers {
             args
@@ -1096,23 +1106,6 @@ query consoleListApps($projectName: String!, $envName: String!, $search: SearchA
             }
             image
             imagePullPolicy
-            livenessProbe {
-              failureThreshold
-              httpGet {
-                httpHeaders
-                path
-                port
-              }
-              initialDelay
-              interval
-              shell {
-                command
-              }
-              tcp {
-                port
-              }
-              type
-            }
             name
             readinessProbe {
               failureThreshold
@@ -1128,15 +1121,6 @@ query consoleListApps($projectName: String!, $envName: String!, $search: SearchA
               max
               min
             }
-            volumes {
-              items {
-                fileName
-                key
-              }
-              mountPath
-              refName
-              type
-            }
           }
           displayName
           freeze
@@ -1184,6 +1168,14 @@ query consoleListApps($projectName: String!, $envName: String!, $search: SearchA
             namespace
           }
         }
+        syncStatus {
+          action
+          error
+          lastSyncedAt
+          recordVersion
+          state
+          syncScheduledAt
+        }
         updateTime
       }
     }
@@ -1243,43 +1235,14 @@ query consoleListRouters($projectName: String!, $envName: String!, $search: Sear
         }
         markedForDeletion
         metadata {
+          generation
           name
           namespace
         }
         projectName
+        recordVersion
         spec {
-          backendProtocol
-          basicAuth {
-            enabled
-            secretName
-            username
-          }
-          cors {
-            allowCredentials
-            enabled
-            origins
-          }
           domains
-          https {
-            clusterIssuer
-            enabled
-            forceRedirect
-          }
-          ingressClass
-          maxBodySizeInMB
-          rateLimit {
-            connections
-            enabled
-            rpm
-            rps
-          }
-          routes {
-            app
-            lambda
-            path
-            port
-            rewrite
-          }
         }
         status {
           checks
@@ -1296,6 +1259,14 @@ query consoleListRouters($projectName: String!, $envName: String!, $search: Sear
             namespace
           }
         }
+        syncStatus {
+          action
+          error
+          lastSyncedAt
+          recordVersion
+          state
+          syncScheduledAt
+        }
         updateTime
       }
     }
@@ -3359,8 +3330,13 @@ mutation consoleUpdateManagedResource($projectName: String!, $envName: String!,
   }
 }
 
-query consoleListManagedResources($projectName: String!, $envName: String!) {
-  core_listManagedResources(projectName: $projectName, envName: $envName) {
+query consoleListManagedResources($projectName: String!, $envName: String!, $search: SearchManagedResources, $pq: CursorPaginationIn) {
+  core_listManagedResources(
+    projectName: $projectName
+    envName: $envName
+    search: $search
+    pq: $pq
+  ) {
     edges {
       cursor
       node {
@@ -3380,10 +3356,12 @@ query consoleListManagedResources($projectName: String!, $envName: String!) {
         }
         markedForDeletion
         metadata {
+          generation
           name
           namespace
         }
         projectName
+        recordVersion
         spec {
           resourceTemplate {
             apiVersion
@@ -3412,6 +3390,14 @@ query consoleListManagedResources($projectName: String!, $envName: String!) {
             namespace
           }
         }
+        syncStatus {
+          action
+          error
+          lastSyncedAt
+          recordVersion
+          state
+          syncScheduledAt
+        }
         updateTime
       }
     }
@@ -3686,29 +3672,6 @@ query consoleListConsoleVpnDevices($search: CoreSearchVPNDevices, $pq: CursorPag
             targetPort
           }
         }
-        status {
-          checks
-          isReady
-          lastReadyGeneration
-          lastReconcileTime
-          message {
-            RawMessage
-          }
-          resources {
-            apiVersion
-            kind
-            name
-            namespace
-          }
-        }
-        syncStatus {
-          action
-          error
-          lastSyncedAt
-          recordVersion
-          state
-          syncScheduledAt
-        }
         updateTime
       }
     }
@@ -3754,6 +3717,8 @@ query consoleGetConsoleVpnDevice($name: String!) {
 
 query consoleListConsoleVpnDevicesForUser {
   core_listVPNDevicesForUser {
+    accountName
+    apiVersion
     createdBy {
       userEmail
       userId
@@ -3762,14 +3727,20 @@ query consoleListConsoleVpnDevicesForUser {
     creationTime
     displayName
     environmentName
+    id
+    kind
     lastUpdatedBy {
       userEmail
       userId
       userName
     }
     markedForDeletion
     metadata {
+      annotations
+      creationTimestamp
+      deletionTimestamp
       generation
+      labels
       name
       namespace
     }
@@ -3788,30 +3759,11 @@ query consoleListConsoleVpnDevicesForUser {
         targetPort
       }
     }
-    status {
-      checks
-      isReady
-      lastReadyGeneration
-      lastReconcileTime
-      message {
-        RawMessage
-      }
-      resources {
-        apiVersion
-        kind
-        name
-        namespace
-      }
-    }
-    syncStatus {
-      action
-      error
-      lastSyncedAt
-      recordVersion
-      state
-      syncScheduledAt
-    }
     updateTime
+    wireguardConfig {
+      encoding
+      value
+    }
   }
 }
 

diff --git a/src/apps/console/components/name-id-view.tsx b/src/apps/console/components/name-id-view.tsx
@@ -108,6 +108,8 @@ export const NameIdView = forwardRef<HTMLInputElement, INameIdView>(
     }, [displayName, name]);
 
     const checkNameAvailable = () => {
+      console.log('inside ', errors);
+
       if (errors) {
         // onCheckError?.(true);
         return errors;
@@ -174,6 +176,7 @@ export const NameIdView = forwardRef<HTMLInputElement, INameIdView>(
                   'secret',
                   'project_managed_service',
                   'console_vpn_device',
+                  'router',
                 ].includes(tempResType)
                   ? {
                       projectName: project,
@@ -217,17 +220,6 @@ export const NameIdView = forwardRef<HTMLInputElement, INameIdView>(
       [displayName, name, isUpdate]
     );
 
-    useEffect(() => {
-      console.log(
-        'error: ',
-        (!nameLoading || !isUpdate) &&
-          ((!nameValid && !!name && !nameLoading) || !!errors),
-        !nameLoading || !isUpdate,
-        !nameValid && !!name && !nameLoading,
-        !!errors
-      );
-    }, []);
-
     return (
       <TextInput
         ref={ref}
@@ -244,10 +236,11 @@ export const NameIdView = forwardRef<HTMLInputElement, INameIdView>(
           if (!isUpdate) {
             handleChange?.('name')(dummyEvent(id));
           }
-
           if (v) {
             setNameLoading(true);
-            handleChange?.(nameErrorLabel)(dummyEvent(true));
+            if (!isUpdate) {
+              handleChange?.(nameErrorLabel)(dummyEvent(true));
+            }
           } else {
             setNameLoading(false);
             handleChange?.(nameErrorLabel)(dummyEvent(false));

diff --git a/src/apps/console/components/sync-status.tsx b/src/apps/console/components/sync-status.tsx
@@ -204,7 +204,11 @@ export const listStatus = ({
   return {
     key,
     className,
-    render: () => <SyncStatus item={item} />,
+    render: () => (
+      <div className="min-w-[20px]">
+        <SyncStatus item={item} />
+      </div>
+    ),
     status: parseStatus({ item, type }),
   };
 };