diff --git a/web/src/apps/auth/routes/_main+/verify-email.tsx b/web/src/apps/auth/routes/_main+/verify-email.tsx
index a1dcd8fb8..b4684551f 100644
--- a/web/src/apps/auth/routes/_main+/verify-email.tsx
+++ b/web/src/apps/auth/routes/_main+/verify-email.tsx
@@ -1,4 +1,3 @@
-import { useAPIClient } from '~/root/lib/client/hooks/api-provider';
import usePersistState from '~/root/lib/client/hooks/use-persist-state';
import { useEffect, useState } from 'react';
import { GQLServerHandler } from '~/auth/server/gql/saved-queries';
@@ -14,12 +13,13 @@ import { IRemixCtx } from '~/root/lib/types/common';
import { ArrowLeft } from '~/components/icons';
import { cn } from '~/components/utils';
import Container from '~/auth/components/container';
+import { useAuthApi } from '~/auth/server/gql/api-provider';
const VerifyEmail = () => {
const { query, email } = useLoaderData();
const navigate = useNavigate();
const { token } = query;
- const api = useAPIClient();
+ const api = useAuthApi();
const [rateLimiter, setRateLimiter] = usePersistState('rateLimiter', {});
@@ -27,7 +27,7 @@ const VerifyEmail = () => {
(async () => {
try {
if (!token) return;
- const { _, errors } = await api.verifyEmail({
+ const { errors } = await api.verifyEmail({
token,
});
if (errors) {
@@ -68,7 +68,7 @@ const VerifyEmail = () => {
setSending(true);
- const { errors } = await api.resendVerificationEmail({ email });
+ const { errors } = await api.resendVerificationEmail();
setSending(false);
diff --git a/web/src/apps/auth/server/gql/saved-queries.ts b/web/src/apps/auth/server/gql/saved-queries.ts
index 6f2b15002..ccab30de7 100644
--- a/web/src/apps/auth/server/gql/saved-queries.ts
+++ b/web/src/apps/auth/server/gql/saved-queries.ts
@@ -25,6 +25,8 @@ import {
AuthCheckOauthEnabledQueryVariables,
AuthSetRemoteAuthHeaderMutation,
AuthSetRemoteAuthHeaderMutationVariables,
+ AuthResendVerificationEmailMutation,
+ AuthResendVerificationEmailMutationVariables,
} from '~/root/src/generated/gql/server';
import { cliQueries } from './cli-queries';
@@ -138,6 +140,19 @@ export const GQLServerHandler = ({ headers, cookies }: IGQLServerProps) => {
}
),
+ resendVerificationEmail: executor(
+ gql`
+ mutation Mutation {
+ auth_resendVerificationEmail
+ }
+ `,
+ {
+ transformer: (data: AuthResendVerificationEmailMutation) =>
+ data.auth_resendVerificationEmail,
+ vars(_: AuthResendVerificationEmailMutationVariables) {},
+ }
+ ),
+
loginPageInitUrls: executor(
gql`
query Query {
diff --git a/web/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx b/web/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx
index a4e2a832c..2e94c38d7 100644
--- a/web/src/apps/console/routes/_main+/$account+/env+/$environment+/_layout.tsx
+++ b/web/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: (
-
-
- Managed resources
-
- ),
- to: '/managed-resources',
- value: '/managed-resources',
- },
+ // {
+ // label: (
+ //
+ //
+ // Managed resources
+ //
+ // ),
+ // to: '/managed-resources',
+ // value: '/managed-resources',
+ // },
// {
// label: 'Jobs & Crons',
// to: '/jc/task',
diff --git a/web/src/apps/console/routes/_main+/$account+/env+/$environment+/config.$config/handle.tsx b/web/src/apps/console/routes/_main+/$account+/env+/$environment+/config.$config/handle.tsx
index 441a698d1..735a0b022 100644
--- a/web/src/apps/console/routes/_main+/$account+/env+/$environment+/config.$config/handle.tsx
+++ b/web/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/web/src/apps/console/routes/_main+/$account+/env+/$environment+/cs+/configs._index/handle-config.tsx b/web/src/apps/console/routes/_main+/$account+/env+/$environment+/cs+/configs._index/handle-config.tsx
index a4512e4ad..e973eabdc 100644
--- a/web/src/apps/console/routes/_main+/$account+/env+/$environment+/cs+/configs._index/handle-config.tsx
+++ b/web/src/apps/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/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
index 207dd460f..e97badfb4 100644
--- 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"
/>
);
@@ -219,6 +220,7 @@ export const ExposedPorts = () => {
error={!!portError}
message={portError}
disableWhileLoading
+ createLabel="Exposed ports"
/>