fixed merge conflict

Dockerfile.webinar

@@ -0,0 +1,34 @@
+FROM node:20.8.1-alpine as base
+RUN apk add g++ make py3-pip
+RUN npm i -g pnpm
+WORKDIR /app
+COPY ./package.json ./package.json
+COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
+
+COPY ./src/generated/package.json ./src/generated/package.json
+COPY ./src/generated/plugin/package.json ./src/generated/plugin/package.json
+
+RUN pnpm i
+
+
+# design system
+COPY ./src/design-system/ ./src/design-system/
+WORKDIR /app/src/design-system
+RUN pnpm i -p
+RUN pnpm local:release
+
+# webinar
+WORKDIR /app
+COPY ./src/apps/webinar ./src/apps/webinar
+WORKDIR /app/src/apps/webinar
+RUN pnpm i -p
+RUN pnpm build
+
+FROM node:20.8.1-alpine
+WORKDIR /app
+COPY --from=base /app/src/apps/webinar/.next ./.next
+COPY --from=base /app/src/apps/webinar/public ./public
+COPY --from=base /app/src/apps/webinar/package.json ./package.json
+COPY --from=base /app/src/apps/webinar/node_modules ./node_modules
+
+ENTRYPOINT npm run start

Taskfile.yaml

@@ -199,3 +199,23 @@ tasks:
     cmds:
       # - cd ./src/design-system && mkdir -p out && pnpm local:release
       - docker buildx build  . -t {{.tag}} -f Dockerfile.website
+
+  container-build-webinar:
+    preconditions:
+      - sh: '[[ -n "{{.tag}}" ]]'
+        msg: "var tag must have a value"
+    vars:
+      Image: ghcr.io/kloudlite/web/events:{{.tag}}
+    cmds:
+      # - docker buildx build  . -t {{.Image}} -f Dockerfile.webinar
+      - docker build  -t {{.Image}} -f Dockerfile.webinar . 
+
+  container-push-webinar:
+    preconditions:
+      - sh: '[[ -n "{{.tag}}" ]]'
+        msg: "var tag must have a value"
+    vars:
+      Image: ghcr.io/kloudlite/web/events:{{.tag}}
+    cmds:
+      # - docker buildx build -t {{.Image}} --platform linux/amd64 -f Dockerfile.webinar --push .
+      - docker buildx build . -t {{.Image}} --platform linux/amd64 -f Dockerfile.webinar --output=type=image,compression=zstd,force-compression=true,compression-level=12,push=true

fake-data-generator/gen.ts

@@ -34,6 +34,8 @@ const types: string[] = [
   'ConsoleListGlobalVpnDevicesQuery',
   'ConsoleListByokClustersQuery',
   'ConsoleListAllClustersQuery',
+  'ConsoleListRegistryImagesQuery',
+  'ConsoleListImagePullSecretsQuery',
 ];
 
 async function fake(files: string[], types: string[] = []) {

gql-queries-generator/doc/queries.graphql

@@ -394,6 +394,19 @@ query consoleGetCluster($name: String!) {
   }
 }
 
+query consoleListClusterStatus($pagination: CursorPaginationIn) {
+  infra_listBYOKClusters(pagination: $pagination) {
+    edges {
+      node {
+        lastOnlineAt
+        metadata {
+          name
+        }
+      }
+    }
+  }
+}
+
 query consoleGetKubeConfig($name: String!) {
   infra_getCluster(name: $name) {
     adminKubeconfig {
@@ -739,6 +752,7 @@ query consoleGetEnvironment($name: String!) {
         privateIngressClass
         publicIngressClass
       }
+      suspend
       targetNamespace
     }
     status {
@@ -814,6 +828,7 @@ query consoleListEnvironments($search: SearchEnvironments, $pq: CursorPagination
             privateIngressClass
             publicIngressClass
           }
+          suspend
           targetNamespace
         }
         status {
@@ -3990,6 +4005,51 @@ mutation consoleDeleteImagePullSecrets($name: String!) {
   core_deleteImagePullSecret(name: $name)
 }
 
+query consoleGetImagePullSecret($name: String!) {
+  core_getImagePullSecret(name: $name) {
+    accountName
+    createdBy {
+      userEmail
+      userId
+      userName
+    }
+    creationTime
+    displayName
+    dockerConfigJson
+    environments
+    format
+    id
+    lastUpdatedBy {
+      userEmail
+      userId
+      userName
+    }
+    markedForDeletion
+    metadata {
+      annotations
+      creationTimestamp
+      deletionTimestamp
+      generation
+      labels
+      name
+      namespace
+    }
+    recordVersion
+    registryPassword
+    registryURL
+    registryUsername
+    syncStatus {
+      action
+      error
+      lastSyncedAt
+      recordVersion
+      state
+      syncScheduledAt
+    }
+    updateTime
+  }
+}
+
 query consoleListImagePullSecrets($search: SearchImagePullSecrets, $pq: CursorPaginationIn) {
   core_listImagePullSecrets(search: $search, pq: $pq) {
     edges {
@@ -4404,6 +4464,57 @@ query consoleListImportedManagedResources($envName: String!, $search: SearchImpo
   }
 }
 
+mutation consoleDeleteRegistryImage($image: String!) {
+  core_deleteRegistryImage(image: $image)
+}
+
+query consoleGetRegistryImage($image: String!) {
+  core_getRegistryImage(image: $image) {
+    accountName
+    creationTime
+    id
+    imageName
+    imageTag
+    markedForDeletion
+    meta
+    recordVersion
+    updateTime
+  }
+}
+
+query consoleGetRegistryImageUrl($image: String!, $meta: Map!) {
+  core_getRegistryImageURL(image: $image, meta: $meta) {
+    scriptUrl
+    url
+  }
+}
+
+query consoleListRegistryImages($pq: CursorPaginationIn) {
+  core_listRegistryImages(pq: $pq) {
+    edges {
+      cursor
+      node {
+        accountName
+        creationTime
+        id
+        imageName
+        imageTag
+        markedForDeletion
+        meta
+        recordVersion
+        updateTime
+      }
+    }
+    pageInfo {
+      endCursor
+      hasNextPage
+      hasPrevPage
+      startCursor
+    }
+    totalCount
+  }
+}
+
 query iotconsoleAccountCheckNameAvailability($name: String!) {
   accounts_checkNameAvailability(name: $name) {
     result
@@ -6130,6 +6241,33 @@ query authCli_getEnvironment($name: String!) {
   }
 }
 
+mutation authCli_cloneEnvironment($clusterName: String!, $sourceEnvName: String!, $destinationEnvName: String!, $displayName: String!, $environmentRoutingMode: Github__com___kloudlite___operator___apis___crds___v1__EnvironmentRoutingMode!) {
+  core_cloneEnvironment(
+    clusterName: $clusterName
+    sourceEnvName: $sourceEnvName
+    destinationEnvName: $destinationEnvName
+    displayName: $displayName
+    environmentRoutingMode: $environmentRoutingMode
+  ) {
+    id
+    displayName
+    clusterName
+    metadata {
+      name
+      namespace
+    }
+    status {
+      isReady
+      message {
+        RawMessage
+      }
+    }
+    spec {
+      targetNamespace
+    }
+  }
+}
+
 query authCli_getSecret($envName: String!, $name: String!) {
   core_getSecret(envName: $envName, name: $name) {
     displayName
@@ -6347,6 +6485,7 @@ query authCli_getRemoteLogin($loginId: String!, $secret: String!) {
 mutation authCli_createClusterReference($cluster: BYOKClusterIn!) {
   infra_createBYOKCluster(cluster: $cluster) {
     id
+    clusterToken
     metadata {
       name
     }
@@ -6486,6 +6625,24 @@ query authCli_listImportedManagedResources($envName: String!, $search: SearchImp
   }
 }
 
+query authCli_listByokClusters($search: SearchCluster, $pagination: CursorPaginationIn) {
+  infra_listBYOKClusters(search: $search, pagination: $pagination) {
+    edges {
+      cursor
+      node {
+        displayName
+        id
+        metadata {
+          name
+          namespace
+        }
+        updateTime
+      }
+    }
+    totalCount
+  }
+}
+
 mutation authSetRemoteAuthHeader($loginId: String!, $authHeader: String) {
   auth_setRemoteAuthHeader(loginId: $loginId, authHeader: $authHeader)
 }

lib/types/common.ts

@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 
 export type NonNullableString = string & NonNullable<undefined>;
 
-export type MapType<T = string | number | boolean> = {
+export type MapType<T = string | number | Date | boolean> = {
   [key: string]: T | MapType<T>;
 };