diff --git a/app/apis/admin/create-subscribe-plan.ts b/app/apis/admin/create-subscribe-plan.ts index 8035263..dfacc2c 100644 --- a/app/apis/admin/create-subscribe-plan.ts +++ b/app/apis/admin/create-subscribe-plan.ts @@ -1,7 +1,7 @@ import { z } from 'zod' import { HttpServer, type THttpServer } from '~/libs/http-server' -import type { TSubscribePlanSchema } from '~/pages/form-subscriptions-plan' +import type { TSubscribePlanSchema } from '~/pages/form-subscribe-plan' const subscribePlanResponseSchema = z.object({ data: z.object({ diff --git a/app/apis/admin/delete-subscribe-plan.ts b/app/apis/admin/delete-subscribe-plan.ts index 449e1bf..6a82d57 100644 --- a/app/apis/admin/delete-subscribe-plan.ts +++ b/app/apis/admin/delete-subscribe-plan.ts @@ -1,7 +1,7 @@ import { z } from 'zod' import { HttpServer, type THttpServer } from '~/libs/http-server' -import type { TSubscribePlanSchema } from '~/pages/form-subscriptions-plan' +import type { TSubscribePlanSchema } from '~/pages/form-subscribe-plan' const subscribePlanResponseSchema = z.object({ data: z.object({ diff --git a/app/apis/admin/update-subscribe-plan.ts b/app/apis/admin/update-subscribe-plan.ts index 4676e28..11e4db0 100644 --- a/app/apis/admin/update-subscribe-plan.ts +++ b/app/apis/admin/update-subscribe-plan.ts @@ -1,7 +1,7 @@ import { z } from 'zod' import { HttpServer, type THttpServer } from '~/libs/http-server' -import type { TSubscribePlanSchema } from '~/pages/form-subscriptions-plan' +import type { TSubscribePlanSchema } from '~/pages/form-subscribe-plan' const subscribePlanResponseSchema = z.object({ data: z.object({ diff --git a/app/apis/common/get-subscriptions.ts b/app/apis/common/get-subscriptions.ts index 2d5416d..b2dcee1 100644 --- a/app/apis/common/get-subscriptions.ts +++ b/app/apis/common/get-subscriptions.ts @@ -8,9 +8,9 @@ const subscriptionResponseSchema = z.object({ id: z.string(), code: z.string(), name: z.string(), - length: z.number().optional(), - price: z.number().optional(), - status: z.number().optional(), + length: z.number(), + price: z.number(), + status: z.number(), }), ), }) diff --git a/app/pages/dashboard-plan-subscribe/index.tsx b/app/pages/dashboard-subscribe-plan/index.tsx similarity index 100% rename from app/pages/dashboard-plan-subscribe/index.tsx rename to app/pages/dashboard-subscribe-plan/index.tsx diff --git a/app/pages/form-subscriptions-plan/index.tsx b/app/pages/form-subscribe-plan/index.tsx similarity index 93% rename from app/pages/form-subscriptions-plan/index.tsx rename to app/pages/form-subscribe-plan/index.tsx index 0a224fd..d8d07d5 100644 --- a/app/pages/form-subscriptions-plan/index.tsx +++ b/app/pages/form-subscribe-plan/index.tsx @@ -15,9 +15,9 @@ export const subscribePlanSchema = z.object({ id: z.string().optional(), name: z.string().min(3, 'Nama minimal 3 karakter'), code: z.string(), - length: z.preprocess(Number, z.number().optional()), - price: z.preprocess(Number, z.number().optional()), - status: z.number().optional(), + length: z.preprocess(Number, z.number().min(1, 'Length minimal 1')), + price: z.preprocess(Number, z.number().min(1, 'Harga minimal 1')), + status: z.number(), }) export type TSubscribePlanSchema = z.infer type TProperties = { @@ -36,9 +36,9 @@ export const FormSubscribePlanPage = (properties: TProperties) => { id: subscribePlanData?.id || undefined, code: subscribePlanData?.code || '', name: subscribePlanData?.name || '', - length: subscribePlanData?.length || undefined, - price: subscribePlanData?.price || undefined, - status: subscribePlanData?.status || undefined, + length: subscribePlanData?.length || 0, + price: subscribePlanData?.price || 0, + status: subscribePlanData?.status || 0, }, }) @@ -122,8 +122,8 @@ export const FormSubscribePlanPage = (properties: TProperties) => { /> export default DashboardSubscribePlanCreateLayout diff --git a/app/routes/_admin.lg-admin._dashboard.subscribe-plan.update.$id.tsx b/app/routes/_admin.lg-admin._dashboard.subscribe-plan.update.$id.tsx index 13576d9..19878f5 100644 --- a/app/routes/_admin.lg-admin._dashboard.subscribe-plan.update.$id.tsx +++ b/app/routes/_admin.lg-admin._dashboard.subscribe-plan.update.$id.tsx @@ -1,7 +1,7 @@ import { isRouteErrorResponse } from 'react-router' import { getSubscriptions } from '~/apis/common/get-subscriptions' -import { FormSubscribePlanPage } from '~/pages/form-subscriptions-plan' +import { FormSubscribePlanPage } from '~/pages/form-subscribe-plan' import type { Route } from './+types/_admin.lg-admin._dashboard.subscribe-plan.update.$id' diff --git a/app/routes/actions.admin.subscribe-plan.create.ts b/app/routes/actions.admin.subscribe-plan.create.ts index 4feef5f..7407bcf 100644 --- a/app/routes/actions.admin.subscribe-plan.create.ts +++ b/app/routes/actions.admin.subscribe-plan.create.ts @@ -8,7 +8,7 @@ import { handleCookie } from '~/libs/cookies' import { subscribePlanSchema, type TSubscribePlanSchema, -} from '~/pages/form-subscriptions-plan' +} from '~/pages/form-subscribe-plan' import type { Route } from './+types/actions.admin.subscribe-plan.create' diff --git a/app/routes/actions.admin.subscribe-plan.update.ts b/app/routes/actions.admin.subscribe-plan.update.ts index e8bcad3..dd6055e 100644 --- a/app/routes/actions.admin.subscribe-plan.update.ts +++ b/app/routes/actions.admin.subscribe-plan.update.ts @@ -8,7 +8,7 @@ import { handleCookie } from '~/libs/cookies' import { subscribePlanSchema, type TSubscribePlanSchema, -} from '~/pages/form-subscriptions-plan' +} from '~/pages/form-subscribe-plan' import type { Route } from './+types/actions.admin.subscribe-plan.update'