Merge branch 'release-v1.0.5' into impl/app-image-pull

kloudlite · Mar 13, 2024 · 83df995 · 83df995
2 parents 04c491a + 49fb090
commit 83df995
Show file tree

Hide file tree

Showing 53 changed files with 3,052 additions and 998 deletions.
diff --git a/gql-queries-generator/doc/queries.graphql b/gql-queries-generator/doc/queries.graphql
@@ -134,6 +134,11 @@ query consoleGetProject($name: String!) {
     recordVersion
     status {
       checks
+      checkList {
+        description
+        name
+        title
+      }
       isReady
       lastReadyGeneration
       lastReconcileTime
@@ -193,6 +198,11 @@ query consoleListProjects($search: SearchProjects, $pq: CursorPaginationIn) {
         }
         status {
           checks
+          checkList {
+            description
+            name
+            title
+          }
           isReady
           lastReadyGeneration
           lastReconcileTime
@@ -277,6 +287,11 @@ query consoleListClusters($search: SearchCluster, $pagination: CursorPaginationI
         updateTime
         status {
           checks
+          checkList {
+            description
+            name
+            title
+          }
           isReady
           lastReadyGeneration
           lastReconcileTime
@@ -409,6 +424,11 @@ query consoleGetCluster($name: String!) {
     }
     status {
       checks
+      checkList {
+        description
+        name
+        title
+      }
       isReady
       lastReadyGeneration
       lastReconcileTime
@@ -767,6 +787,11 @@ query consoleGetEnvironment($projectName: String!, $name: String!) {
     }
     status {
       checks
+      checkList {
+        description
+        name
+        title
+      }
       isReady
       lastReadyGeneration
       lastReconcileTime
@@ -836,6 +861,11 @@ query consoleListEnvironments($projectName: String!, $search: SearchEnvironments
         }
         status {
           checks
+          checkList {
+            description
+            name
+            title
+          }
           isReady
           lastReadyGeneration
           lastReconcileTime
@@ -1028,6 +1058,11 @@ query consoleGetApp($projectName: String!, $envName: String!, $name: String!) {
       }
     }
     status {
+      checkList {
+        description
+        title
+        name
+      }
       checks
       isReady
       lastReadyGeneration
@@ -1157,6 +1192,11 @@ query consoleListApps($projectName: String!, $envName: String!, $search: SearchA
             name
             namespace
           }
+          checkList {
+            description
+            title
+            name
+          }
         }
         syncStatus {
           action
@@ -1267,6 +1307,11 @@ query consoleListRouters($projectName: String!, $envName: String!, $search: Sear
         }
         status {
           checks
+          checkList {
+            description
+            name
+            title
+          }
           isReady
           lastReadyGeneration
           lastReconcileTime
@@ -1359,18 +1404,12 @@ query consoleGetRouter($projectName: String!, $envName: String!, $name: String!)
     }
     status {
       checks
-      isReady
-      lastReadyGeneration
-      lastReconcileTime
-      message {
-        RawMessage
-      }
-      resources {
-        apiVersion
-        kind
+      checkList {
+        description
         name
-        namespace
+        title
       }
+      isReady
     }
     updateTime
   }

diff --git a/lib/app-setup/root.tsx b/lib/app-setup/root.tsx
@@ -160,8 +160,10 @@ const NonIdleProgressBar = () => {
 
 const Root = ({
   Wrapper = ({ children }: { children: any }) => children,
+  tagId,
 }: {
   Wrapper: (prop: { children: ReactNode }) => JSX.Element;
+  tagId?: string;
 }) => {
   const env = useLoaderData();
 
@@ -172,6 +174,34 @@ const Root = ({
         <meta name="viewport" content="width=device-width,initial-scale=1" />
         <Links />
         <Meta />
+        {/* <script */}
+        {/*   async */}
+        {/*   src="https://www.googletagmanager.com/gtag/js?id=G-9GFNBFM718" */}
+        {/* /> */}
+        {/* <script> */}
+        {/*   window.dataLayer = window.dataLayer || []; */}
+        {/*   function gtag(){dataLayer.push(arguments);} */}
+        {/*   gtag('js', new Date()); */}
+
+        {/*   gtag('config', 'G-9GFNBFM718'); */}
+        {/* </script> */}
+        <script
+          async
+          src={`https://www.googletagmanager.com/gtag/js?id=${tagId}`}
+        />
+        <script
+          async
+          id="gtag-init"
+          dangerouslySetInnerHTML={{
+            __html: `
+                window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+
+          gtag('config', ${tagId});
+              `,
+          }}
+        />
       </head>
       <body className="antialiased">
         <div

diff --git a/lib/utils/tags.client.ts b/lib/utils/tags.client.ts
@@ -0,0 +1,55 @@
+declare global {
+  interface Window {
+    gtag: (
+      option: string,
+      gaTrackingId: string,
+      options: Record<string, unknown>
+    ) => void;
+  }
+}
+
+/**
+ * @example
+ * https://developers.google.com/analytics/devguides/collection/gtagjs/pages
+ */
+export const pageview = (url: string, trackingId: string) => {
+  if (!window.gtag) {
+    console.warn(
+      'window.gtag is not defined. This could mean your google analytics script has not loaded on the page yet.'
+    );
+    return;
+  }
+  window.gtag('config', trackingId, {
+    page_path: url,
+  });
+};
+
+/**
+ * @example
+ * https://developers.google.com/analytics/devguides/collection/gtagjs/events
+ */
+export const event = ({
+  action,
+  category,
+  label,
+  value,
+}: Record<string, string>) => {
+  if (!window.gtag) {
+    console.warn(
+      'window.gtag is not defined. This could mean your google analytics script has not loaded on the page yet.'
+    );
+    return;
+  }
+  window.gtag('event', action, {
+    event_category: category,
+    event_label: label,
+    value,
+  });
+};
+
+const tag = {
+  pageview,
+  event,
+};
+
+export default tag;
diff --git a/package.json b/package.json
@@ -95,6 +95,7 @@
 		"react-viewport-list": "^7.1.2",
 		"remix": "^1.19.3",
 		"search-in-json": "^1.0.67",
+		"sonner": "^1.4.3",
 		"swr": "^2.2.4",
 		"use-immer": "^0.9.0",
 		"uuid": "^9.0.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/apps/console/components/commons.tsx b/src/apps/console/components/commons.tsx
@@ -88,21 +88,10 @@ export const CopyButton = ({
       setTimeout(() => {
         setCopyIcon(<CopySimple />);
       }, 1000);
-      // toast.success('Copied to clipboard');
     },
   });
 
   return (
-    // <Chips.Chip
-    //   type="CLICKABLE"
-    //   item={title}
-    //   label={title}
-    //   prefix={copyIcon}
-    //   onClick={() => {
-    //     copy(value);
-    //     setCopyIcon(<Check />);
-    //   }}
-    // />
     <div
       onClick={() => {
         copy(value);

diff --git a/src/apps/console/components/icons.tsx b/src/apps/console/components/icons.tsx
@@ -1,4 +1,5 @@
 export {
+  Domain,
   ArrowLeftFill as ArrowLeft,
   ArrowRightFill as ArrowRight,
   Plus,
@@ -41,4 +42,12 @@ export {
   BackingServices,
   VirtualMachine,
   Database,
+  ArrowsClockwise,
+  Info,
+  Fan,
+  WarningCircle,
+  ChecksFill as Checks,
+  CircleNotch,
+  Circle,
+  CircleFill,
 } from '@jengaicons/react';