minor ui changes

kloudlite · Jun 25, 2024 · 3f43f46 · 3f43f46
1 parent 3e571ef
commit 3f43f46
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 72 deletions.
diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx
@@ -1,5 +1,5 @@
 import {
-  BackingServices,
+  // BackingServices,
   CirclesFour,
   GearSix,
   // Plus,
@@ -103,16 +103,16 @@ const tabs = [
     to: '/cs/configs',
     value: '/cs',
   },
-  {
-    label: (
-      <span className="flex flex-row items-center gap-lg">
-        <BackingServices size={tabIconSize} />
-        Managed resources
-      </span>
-    ),
-    to: '/managed-resources',
-    value: '/managed-resources',
-  },
+  // {
+  //   label: (
+  //     <span className="flex flex-row items-center gap-lg">
+  //       <BackingServices size={tabIconSize} />
+  //       Managed resources
+  //     </span>
+  //   ),
+  //   to: '/managed-resources',
+  //   value: '/managed-resources',
+  // },
   // {
   //   label: 'Jobs & Crons',
   //   to: '/jc/task',

diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/config.$config/handle.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/config.$config/handle.tsx
@@ -4,6 +4,7 @@ import Popup from '~/components/molecule/popup';
 import { IDialog, IModifiedItem } from '~/console/components/types.d';
 import { ConsoleApiType } from '~/console/server/gql/saved-queries';
 import { parseName } from '~/console/server/r-utils/common';
+import { constants } from '~/console/server/utils/constants';
 import useForm from '~/lib/client/hooks/use-form';
 import Yup from '~/lib/server/helpers/yup';
 import { handleError } from '~/lib/utils/common';
@@ -75,6 +76,7 @@ const Handle = ({
     validationSchema: Yup.object({
       key: Yup.string()
         .required()
+        .matches(constants.keyFormatRegex, 'Invalid key format')
         .test('is-valid', 'Key already exists.', (value) => {
           if (isUpdate) {
             return true;

diff --git a/...s/console/routes/_main+/$account+/env+/$environment+/cs+/configs._index/handle-config.tsx b/...s/console/routes/_main+/$account+/env+/$environment+/cs+/configs._index/handle-config.tsx
@@ -25,13 +25,13 @@ const HandleConfig = ({ show, setShow }: IDialog) => {
         name: Yup.string().required(),
       }),
       onSubmit: async (val) => {
-        if ( !environment) {
+        if (!environment) {
           throw new Error('Project and Environment is required!.');
         }
         try {
           const { errors: e } = await api.createConfig({
             envName: environment,
-            
+
             config: {
               metadata: {
                 name: val.name,

diff --git a/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/handle.tsx b/src/apps/console/routes/_main+/$account+/env+/$environment+/secret.$secret/handle.tsx
@@ -4,6 +4,7 @@ import Popup from '~/components/molecule/popup';
 import { IDialog, IModifiedItem } from '~/console/components/types.d';
 import { ConsoleApiType } from '~/console/server/gql/saved-queries';
 import { parseName } from '~/console/server/r-utils/common';
+import { constants } from '~/console/server/utils/constants';
 import useForm from '~/lib/client/hooks/use-form';
 import Yup from '~/lib/server/helpers/yup';
 import { handleError } from '~/lib/utils/common';
@@ -72,6 +73,7 @@ const Handle = ({
     validationSchema: Yup.object({
       key: Yup.string()
         .required()
+        .matches(constants.keyFormatRegex, 'Invalid key format')
         .test('is-valid', 'Key already exists.', (value) => {
           if (isUpdate) {
             return true;

diff --git a/src/apps/console/routes/_main+/_layout/_layout.tsx b/src/apps/console/routes/_main+/_layout/_layout.tsx
@@ -36,7 +36,7 @@ import {
   InfraAsCode,
   GearSix,
   Project,
-  BackingServices,
+  // BackingServices,
   BellFill,
   Sliders,
 } from '~/console/components/icons';
@@ -86,16 +86,16 @@ const AccountTabs = () => {
           to: '/environments',
           value: '/environments',
         },
-        {
-          label: (
-            <span className="flex flex-row items-center gap-lg">
-              <BackingServices size={iconSize} />
-              Managed Services
-            </span>
-          ),
-          to: '/managed-services',
-          value: '/managed-services',
-        },
+        // {
+        //   label: (
+        //     <span className="flex flex-row items-center gap-lg">
+        //       <BackingServices size={iconSize} />
+        //       Managed Services
+        //     </span>
+        //   ),
+        //   to: '/managed-services',
+        //   value: '/managed-services',
+        // },
         {
           label: (
             <span className="flex flex-row items-center gap-lg">

diff --git a/src/apps/console/server/gql/queries/config-queries.ts b/src/apps/console/server/gql/queries/config-queries.ts
@@ -20,50 +20,32 @@ export type IConfigs = NN<ConsoleListConfigsQuery['core_listConfigs']>;
 export const configQueries = (executor: IExecutor) => ({
   updateConfig: executor(
     gql`
-      mutation Core_updateConfig(
-        $envName: String!
-        $config: ConfigIn!
-      ) {
-        core_updateConfig(
-          envName: $envName
-          config: $config
-        ) {
+      mutation Core_updateConfig($envName: String!, $config: ConfigIn!) {
+        core_updateConfig(envName: $envName, config: $config) {
           id
         }
       }
     `,
     {
       transformer: (data: ConsoleUpdateConfigMutation) => data,
-      vars(_: ConsoleUpdateConfigMutationVariables) { },
+      vars(_: ConsoleUpdateConfigMutationVariables) {},
     }
   ),
   deleteConfig: executor(
     gql`
-      mutation Core_deleteConfig(
-        $envName: String!
-        $configName: String!
-      ) {
-        core_deleteConfig(
-          envName: $envName
-          configName: $configName
-        )
+      mutation Core_deleteConfig($envName: String!, $configName: String!) {
+        core_deleteConfig(envName: $envName, configName: $configName)
       }
     `,
     {
       transformer: (data: ConsoleDeleteConfigMutation) => data,
-      vars(_: ConsoleDeleteConfigMutationVariables) { },
+      vars(_: ConsoleDeleteConfigMutationVariables) {},
     }
   ),
   getConfig: executor(
     gql`
-      query Core_getConfig(
-        $envName: String!
-        $name: String!
-      ) {
-        core_getConfig(
-          envName: $envName
-          name: $name
-        ) {
+      query Core_getConfig($envName: String!, $name: String!) {
+        core_getConfig(envName: $envName, name: $name) {
           binaryData
           data
           displayName
@@ -83,7 +65,7 @@ export const configQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleGetConfigQuery) => data.core_getConfig,
-      vars(_: ConsoleGetConfigQueryVariables) { },
+      vars(_: ConsoleGetConfigQueryVariables) {},
     }
   ),
   listConfigs: executor(
@@ -93,11 +75,7 @@ export const configQueries = (executor: IExecutor) => ({
         $search: SearchConfigs
         $pq: CursorPaginationIn
       ) {
-        core_listConfigs(
-          envName: $envName
-          search: $search
-          pq: $pq
-        ) {
+        core_listConfigs(envName: $envName, search: $search, pq: $pq) {
           edges {
             cursor
             node {
@@ -141,27 +119,21 @@ export const configQueries = (executor: IExecutor) => ({
     `,
     {
       transformer: (data: ConsoleListConfigsQuery) => data.core_listConfigs,
-      vars(_: ConsoleListConfigsQueryVariables) { },
+      vars(_: ConsoleListConfigsQueryVariables) {},
     }
   ),
   createConfig: executor(
     gql`
-      mutation Core_createConfig(
-        $envName: String!
-        $config: ConfigIn!
-      ) {
-        core_createConfig(
-          envName: $envName
-          config: $config
-        ) {
+      mutation Core_createConfig($envName: String!, $config: ConfigIn!) {
+        core_createConfig(envName: $envName, config: $config) {
           id
         }
       }
     `,
     {
       transformer: (data: ConsoleCreateConfigMutation) =>
         data.core_createConfig,
-      vars(_: ConsoleCreateConfigMutationVariables) { },
+      vars(_: ConsoleCreateConfigMutationVariables) {},
     }
   ),
 });
diff --git a/src/apps/console/server/utils/constants.ts b/src/apps/console/server/utils/constants.ts
@@ -10,4 +10,5 @@ export const constants = {
   metadot: '·',
   dockerImageFormatRegex:
     /^(([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-zA-Z]{2,}(:[0-9]+)?\/)?([a-z0-9]+(-[a-z0-9]+)*\/)*[a-z0-9]+([._-][a-z0-9]+)*(:[a-zA-Z0-9_][a-zA-Z0-9._-]{0,127}[a-zA-Z0-9])?(@[A-Za-z][A-Za-z0-9]*(?:[._-][A-Za-z0-9]+)?:[A-Fa-f0-9]{32,})?$/,
+  keyFormatRegex: /^[A-Za-z0-9_]+([./-][A-Za-z0-9_]+)*$/,
 };
diff --git a/src/generated/gql/sdl.graphql b/src/generated/gql/sdl.graphql
@@ -2074,7 +2074,8 @@ type GlobalVPN {
   creationTime: Date!
   displayName: String!
   id: ID!
-  kloudliteDevice: GlobalVPNKloudliteDevice!
+  kloudliteClusterLocalDevice: GlobalVPNKloudliteClusterLocalDevice!
+  kloudliteGatewayDevice: GlobalVPNKloudliteGatewayDevice!
   lastUpdatedBy: Github__com___kloudlite___api___common__CreatedOrUpdatedBy!
   markedForDeletion: Boolean
   metadata: Metadata!
@@ -2134,7 +2135,8 @@ input GlobalVPNIn {
   allocatableCIDRSuffix: Int!
   CIDR: String!
   displayName: String!
-  kloudliteDevice: GlobalVPNKloudliteDeviceIn!
+  kloudliteClusterLocalDevice: GlobalVPNKloudliteClusterLocalDeviceIn!
+  kloudliteGatewayDevice: GlobalVPNKloudliteGatewayDeviceIn!
   metadata: MetadataIn!
   nonClusterUseAllowedIPs: [String!]!
   numAllocatedClusterCIDRs: Int!
@@ -2143,12 +2145,22 @@ input GlobalVPNIn {
   wgInterface: String!
 }
 
-type GlobalVPNKloudliteDevice {
+type GlobalVPNKloudliteClusterLocalDevice {
   ipAddr: String!
   name: String!
 }
 
-input GlobalVPNKloudliteDeviceIn {
+input GlobalVPNKloudliteClusterLocalDeviceIn {
+  ipAddr: String!
+  name: String!
+}
+
+type GlobalVPNKloudliteGatewayDevice {
+  ipAddr: String!
+  name: String!
+}
+
+input GlobalVPNKloudliteGatewayDeviceIn {
   ipAddr: String!
   name: String!
 }

diff --git a/src/generated/gql/server.ts b/src/generated/gql/server.ts
@@ -1048,7 +1048,8 @@ export type GlobalVpnIn = {
   allocatableCIDRSuffix: Scalars['Int']['input'];
   CIDR: Scalars['String']['input'];
   displayName: Scalars['String']['input'];
-  kloudliteDevice: GlobalVpnKloudliteDeviceIn;
+  kloudliteClusterLocalDevice: GlobalVpnKloudliteClusterLocalDeviceIn;
+  kloudliteGatewayDevice: GlobalVpnKloudliteGatewayDeviceIn;
   metadata: MetadataIn;
   nonClusterUseAllowedIPs: Array<Scalars['String']['input']>;
   numAllocatedClusterCIDRs: Scalars['Int']['input'];
@@ -1057,7 +1058,12 @@ export type GlobalVpnIn = {
   wgInterface: Scalars['String']['input'];
 };
 
-export type GlobalVpnKloudliteDeviceIn = {
+export type GlobalVpnKloudliteClusterLocalDeviceIn = {
+  ipAddr: Scalars['String']['input'];
+  name: Scalars['String']['input'];
+};
+
+export type GlobalVpnKloudliteGatewayDeviceIn = {
   ipAddr: Scalars['String']['input'];
   name: Scalars['String']['input'];
 };