- remove invite code screen from console

- update devdoc documentation
kloudlite · Jun 27, 2024 · 4371fc7 · 4371fc7
1 parent cb6bf3a
commit 4371fc7
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 134 deletions.
diff --git a/web/gql-queries-generator/doc/queries.graphql b/web/gql-queries-generator/doc/queries.graphql
@@ -1924,10 +1924,6 @@ mutation consoleDeleteAccountMembership($accountName: String!, $memberId: ID!) {
   accounts_removeAccountMembership(accountName: $accountName, memberId: $memberId)
 }
 
-mutation consoleVerifyInviteCode($invitationCode: String!) {
-  auth_verifyInviteCode(invitationCode: $invitationCode)
-}
-
 query consoleGetCredToken($username: String!) {
   cr_getCredToken(username: $username)
 }

diff --git a/web/lib/server/helpers/minimal-auth.ts b/web/lib/server/helpers/minimal-auth.ts
@@ -53,10 +53,6 @@ export const minimalAuth = async (ctx: IExtRemixCtx) => {
     return redirect(`${authBaseUrl}/verify-email`);
   }
 
-  if (whoAmI.data && !whoAmI.data.approved) {
-    return redirect(`${consoleBaseUrl}/invite-code`);
-  }
-
   ctx.authProps = (props: MapType) => {
     return {
       ...props,

diff --git a/web/package.json b/web/package.json
@@ -26,7 +26,7 @@
 		"@jengaicons/react": "1.6.0",
 		"@mdx-js/react": "^2.3.0",
 		"@monaco-editor/react": "^4.6.0",
-		"@oshq/react-select": "^1.4.2",
+		"@oshq/react-select": "^1.4.4",
 		"@radix-ui/primitive": "^1.0.1",
 		"@radix-ui/react-alert-dialog": "1.0.4",
 		"@radix-ui/react-checkbox": "^1.0.4",

diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
diff --git a/web/src/apps/console/routes/_main+/$account+/env+/$environment+/new-app/app-network.tsx b/web/src/apps/console/routes/_main+/$account+/env+/$environment+/new-app/app-network.tsx
@@ -162,6 +162,7 @@ const ExposedRoute = () => {
         // error={!!portError}
         // message={portError}
         disableWhileLoading
+        createLabel="Exposed Domains"
       />
     </div>
   );
@@ -219,6 +220,7 @@ export const ExposedPorts = () => {
             error={!!portError}
             message={portError}
             disableWhileLoading
+            createLabel="Exposed ports"
           />
         </div>
       </div>

diff --git a/web/src/apps/console/routes/_main+/_index.tsx b/web/src/apps/console/routes/_main+/_index.tsx
@@ -1,11 +1,5 @@
 import { redirect } from '@remix-run/node';
-import { GQLServerHandler } from '~/root/lib/server/gql/saved-queries';
-import { IRemixCtx } from '~/root/lib/types/common';
 
-export const loader = async (ctx: IRemixCtx) => {
-  const { data } = await GQLServerHandler(ctx.request).whoAmI();
-  if (data && !data.approved) {
-    return redirect(`/invite-code`);
-  }
+export const loader = async () => {
   return redirect('/teams');
 };
diff --git a/web/src/apps/console/routes/invite-code.tsx b/web/src/apps/console/routes/invite-code.tsx
diff --git a/web/src/apps/console/server/gql/queries/access-queries.ts b/web/src/apps/console/server/gql/queries/access-queries.ts
@@ -20,8 +20,6 @@ import {
   ConsoleRejectInvitationMutationVariables,
   ConsoleDeleteAccountMembershipMutation,
   ConsoleDeleteAccountMembershipMutationVariables,
-  ConsoleVerifyInviteCodeMutation,
-  ConsoleVerifyInviteCodeMutationVariables,
 } from '~/root/src/generated/gql/server';
 
 export type IInvites = NN<
@@ -210,17 +208,4 @@ export const accessQueries = (executor: IExecutor) => ({
       vars(_: ConsoleDeleteAccountMembershipMutationVariables) {},
     }
   ),
-
-  verifyInviteCode: executor(
-    gql`
-      mutation Auth_verifyInviteCode($invitationCode: String!) {
-        auth_verifyInviteCode(invitationCode: $invitationCode)
-      }
-    `,
-    {
-      transformer: (data: ConsoleVerifyInviteCodeMutation) =>
-        data.auth_verifyInviteCode,
-      vars(_: ConsoleVerifyInviteCodeMutationVariables) {},
-    }
-  ),
 });
diff --git a/web/src/generated/gql/server.ts b/web/src/generated/gql/server.ts
@@ -3633,14 +3633,6 @@ export type ConsoleDeleteAccountMembershipMutation = {
   accounts_removeAccountMembership: boolean;
 };
 
-export type ConsoleVerifyInviteCodeMutationVariables = Exact<{
-  invitationCode: Scalars['String']['input'];
-}>;
-
-export type ConsoleVerifyInviteCodeMutation = {
-  auth_verifyInviteCode: boolean;
-};
-
 export type ConsoleGetCredTokenQueryVariables = Exact<{
   username: Scalars['String']['input'];
 }>;