review fixes

This commit is contained in:
x032205
2025-05-12 14:49:45 -04:00
parent d5dbc7d7e0
commit 091e521180
11 changed files with 104 additions and 48 deletions
@@ -29,8 +29,15 @@ import { IdentityFormTab } from "./types";
const schema = z
.object({
tenancyOcid: z.string().trim().min(1, "Tenancy OCID is required."),
allowedUsernames: z.string(),
tenancyOcid: z
.string()
.trim()
.min(1, "Tenancy OCID cannot be empty.")
.refine(
(val) => /^ocid1\.tenancy\.oc1\..+$/.test(val),
"Invalid Tenancy OCID format. Must start with ocid1.tenancy.oc1."
),
allowedUsernames: z.string().optional(),
accessTokenTTL: z
.string()
.refine(
@@ -110,7 +117,7 @@ export const IdentityOciAuthForm = ({
if (data) {
reset({
tenancyOcid: data.tenancyOcid,
allowedUsernames: data.allowedUsernames,
allowedUsernames: data.allowedUsernames || undefined,
accessTokenTTL: String(data.accessTokenTTL),
accessTokenMaxTTL: String(data.accessTokenMaxTTL),
accessTokenNumUsesLimit: String(data.accessTokenNumUsesLimit),
@@ -125,7 +132,7 @@ export const IdentityOciAuthForm = ({
} else {
reset({
tenancyOcid: "",
allowedUsernames: "",
allowedUsernames: undefined,
accessTokenTTL: "2592000",
accessTokenMaxTTL: "2592000",
accessTokenNumUsesLimit: "0",
@@ -161,7 +168,7 @@ export const IdentityOciAuthForm = ({
organizationId: orgId,
identityId,
tenancyOcid,
allowedUsernames: allowedUsernames || "",
allowedUsernames: allowedUsernames || undefined,
accessTokenTTL: Number(accessTokenTTL),
accessTokenMaxTTL: Number(accessTokenMaxTTL),
accessTokenNumUsesLimit: Number(accessTokenNumUsesLimit),
@@ -1,37 +1,33 @@
import { faHome } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import {
createFileRoute,
linkOptions,
stripSearchParams,
} from '@tanstack/react-router'
import { zodValidator } from '@tanstack/zod-adapter'
import { z } from 'zod'
import { faHome } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { createFileRoute, linkOptions, stripSearchParams } from "@tanstack/react-router";
import { zodValidator } from "@tanstack/zod-adapter";
import { z } from "zod";
import { SettingsPage } from './SettingsPage'
import { SettingsPage } from "./SettingsPage";
const SettingsPageQueryParams = z.object({
selectedTab: z.string().catch(''),
})
selectedTab: z.string().catch("")
});
export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/organization/settings/',
"/_authenticate/_inject-org-details/_org-layout/organization/settings/"
)({
component: SettingsPage,
validateSearch: zodValidator(SettingsPageQueryParams),
search: {
middlewares: [stripSearchParams({ selectedTab: '' })],
middlewares: [stripSearchParams({ selectedTab: "" })]
},
context: () => ({
breadcrumbs: [
{
label: 'Home',
label: "Home",
icon: () => <FontAwesomeIcon icon={faHome} />,
link: linkOptions({ to: '/' }),
link: linkOptions({ to: "/" })
},
{
label: 'Settings',
},
],
}),
})
label: "Settings"
}
]
})
});