Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix: invalid policy PK (#20337)

ecmadao21dc34890fad
diff --git a/backend/migrator/migration/3.18/0001##policy_composite_pk.sql b/backend/migrator/migration/3.18/0001##policy_composite_pk.sql
new file mode 100644
index 0000000000..5f5d7847ef
--- /dev/null
+++ b/backend/migrator/migration/3.18/0001##policy_composite_pk.sql
@@ -0,0 +1,14 @@
+-- Change policy PK from (resource_type, resource, type) to
+-- (workspace, resource_type, resource, type) for multi-workspace support.
+-- The old PK rejected cross-workspace policies sharing the same
+-- (resource_type, resource, type) triple — e.g. two workspaces each with a
+-- TAG policy on `environments/prod` collided on policy_pkey on INSERT before
+-- the workspace-scoped ON CONFLICT clause could route the upsert to UPDATE.
+ALTER TABLE policy DROP CONSTRAINT IF EXISTS policy_pkey;
+DO $$
+BEGIN
+ ALTER TABLE policy ADD PRIMARY KEY (workspace, resource_type, resource, type);
+EXCEPTION WHEN duplicate_table THEN
+ -- PK already exists.
+END $$;
+DROP INDEX IF EXISTS idx_policy_unique_workspace_resource;
diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sql
index 6760b8238f..302c0d3fbf 100644
--- a/backend/migrator/migration/LATEST.sql
+++ b/backend/migrator/migration/LATEST.sql
@@ -98,11 +98,10 @@ CREATE TABLE policy (
-- TAG: TagPolicy
payload jsonb NOT NULL DEFAULT '{}',
inherit_from_parent boolean NOT NULL DEFAULT TRUE,
- PRIMARY KEY (resource_type, resource, type)
+ PRIMARY KEY (workspace, resource_type, resource, type)
);
CREATE INDEX idx_policy_workspace ON policy(workspace);
-CREATE UNIQUE INDEX idx_policy_unique_workspace_resource ON policy(workspace, resource_type, resource, type);
-- idp stores generic identity provider.
CREATE TABLE idp (
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index b5c6d8b3ec..51ed14f3fa 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -15,8 +15,8 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.18.0"), *files[len(files)-1].version)
- require.Equal(t, "migration/3.18/0000##add_email_verification_code.sql", files[len(files)-1].path)
+ require.Equal(t, semver.MustParse("3.18.1"), *files[len(files)-1].version)
+ require.Equal(t, "migration/3.18/0001##policy_composite_pk.sql", files[len(files)-1].path)
}
func TestVersionUnique(t *testing.T) {
diff --git a/frontend/src/react/components/DatabaseGroupForm.tsx b/frontend/src/react/components/DatabaseGroupForm.tsx
index 1fc4b7c6d5..e2074b9783 100644
--- a/frontend/src/react/components/DatabaseGroupForm.tsx
+++ b/frontend/src/react/components/DatabaseGroupForm.tsx
@@ -208,9 +208,9 @@ export function DatabaseGroupForm({
/>
<div className="mt-2">
<ResourceIdField
+ suffix
value={resourceId}
- resourceType="database-group"
- resourceName="database-group"
+ resourceName={t("common.database-group")}
resourceTitle={title}
readonly={!isCreating}
validate={isCreating ? validateResourceId : undefined}
diff --git a/frontend/src/react/components/ResourceIdField.tsx b/frontend/src/react/components/ResourceIdField.tsx
index 64d72f0af1..383b9e749c 100644
--- a/frontend/src/react/components/ResourceIdField.tsx
+++ b/frontend/src/react/components/ResourceIdField.tsx
@@ -14,15 +14,6 @@ import { randomString } from "@/utils";
const VALID_CHARS = "abcdefghijklmnopqrstuvwxyz1234567890-";
const RESOURCE_ID_PATTERN = /^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$/;
-type ResourceType =
- | "environment"
- | "instance"
- | "project"
- | "idp"
- | "role"
- | "database-group"
- | "review-config";
-
export interface ResourceIdFieldRef {
resourceId: string;
isValidated: boolean;
@@ -31,7 +22,9 @@ export interface ResourceIdFieldRef {
interface ResourceIdFieldProps {
value: string;
- resourceType: ResourceType;
+ // Localized resource-type label (e.g. "Project", "Environment").
+ // Used in the field label, description, placeholder, and validation
+ // messages — NOT the user-entered title/name of the resource.
resourceName: string;
resourceTitle?: string;
suffix?: boolean;
@@ -68,7 +61,6 @@ export const ResourceIdField = forwardRef<
>(function ResourceIdField(
{
value,
- resourceType: _resourceType, // reserved for future per-type behavior
resourceName,
resourceTitle,
suffix = false,
@@ -222,7 +214,7 @@ export const ResourceIdField = forwardRef<
)}
</div>
) : (
- <div className="mt-1">
+ <div className="mt-3">
<label className="textlabel flex items-center">
{t("resource-id.self", { resource: resourceName })}
<span className="ml-0.5 text-error">*</span>
diff --git a/frontend/src/react/components/header/ProjectCreateDialog.tsx b/frontend/src/react/components/header/ProjectCreateDialog.tsx
index ea235ee8f3..dade0eddb3 100644
--- a/frontend/src/react/components/header/ProjectCreateDialog.tsx
+++ b/frontend/src/react/components/header/ProjectCreateDialog.tsx
@@ -159,10 +159,10 @@ export function ProjectCreateDialog({
onChange={(e) => setTitle(e.target.value)}
/>
<ResourceIdField
+ suffix
ref={resourceIdFieldRef}
value={resourceId}
- resourceType="project"
- resourceName={title}
+ resourceName={t("common.project")}
resourceTitle={title}
validate={validate}
onChange={setResourceId}
diff --git a/frontend/src/react/components/instance/InstanceFormBody.tsx b/frontend/src/react/components/instance/InstanceFormBody.tsx
index bcf49e696a..e902795882 100644
--- a/frontend/src/react/components/instance/InstanceFormBody.tsx
+++ b/frontend/src/react/components/instance/InstanceFormBody.tsx
@@ -15,6 +15,7 @@ import { EnvironmentSelect } from "@/react/components/EnvironmentSelect";
import { FeatureBadge } from "@/react/components/FeatureBadge";
import { LabelListEditor } from "@/react/components/LabelListEditor";
import { LearnMoreLink } from "@/react/components/LearnMoreLink";
+import { ResourceIdField } from "@/react/components/ResourceIdField";
import { Alert } from "@/react/components/ui/alert";
import { Button } from "@/react/components/ui/button";
import { Checkbox } from "@/react/components/ui/checkbox";
@@ -32,7 +33,11 @@ import {
environmentNamePrefix,
instanceNamePrefix,
} from "@/store/modules/v1/common";
-import { isValidEnvironmentName, UNKNOWN_ID } from "@/types";
+import {
+ isValidEnvironmentName,
+ UNKNOWN_ID,
+ type ValidatedMessage,
+} from "@/types";
import { Engine } from "@/types/proto-es/v1/common_pb";
import {
DataSource_AddressSchema,
@@ -262,248 +267,6 @@ function InstanceEngineRadioGrid({
);
}
-// Matches Vue ResourceIdField component behavior exactly:
-// - Auto-generates resource ID from title with escape + optional random suffix on duplicate
-// - Shows inline "Instance ID: xxx It cannot be changed later. Edit" by default
-// - Only shows input field when "Edit" is clicked (manualEdit mode)
-// - Validates: empty, min/max length, pattern, duplicate via fetchResource
-
-const RESOURCE_ID_CHARS = "abcdefghijklmnopqrstuvwxyz1234567890-";
-const RESOURCE_ID_PATTERN = /^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$/;
-
-function randomString(len: number): string {
- const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
- let result = "";
- for (let i = 0; i < len; i++) {
- result += chars.charAt(Math.floor(Math.random() * chars.length));
- }
- return result;
-}
-
-function escapeResourceTitle(str: string): string {
- return str
- .toLowerCase()
- .split("")
- .map((char) => {
- if (char === " ") return "-";
- if (char.match(/\s/)) return "";
- if (RESOURCE_ID_CHARS.includes(char)) return char;
- // Map non-ASCII to a deterministic letter
- const alpha = "abcdefghijklmnopqrstuvwxyz";
- return alpha.charAt(char.charCodeAt(0) % alpha.length);
- })
- .join("")
- .toLowerCase();
-}
-
-interface ValidatedMessage {
- type: "error" | "warning";
- message: string;
-}
-
-function ResourceIdField({
- value,
- onChange,
- onValidationChange,
- resourceTitle,
- readonly,
- fetchResource,
-}: {
- value: string;
- onChange: (id: string) => void;
- onValidationChange?: (valid: boolean) => void;
- resourceTitle: string;
- readonly: boolean;
- fetchResource?: (id: string) => Promise<unknown>;
-}) {
- const { t } = useTranslation();
- const [resourceId, setResourceId] = useState(value);
- const [manualEdit, setManualEdit] = useState(false);
- const [validatedMessages, setValidatedMessages] = useState<
- ValidatedMessage[]
- >([]);
- const initializedRef = useRef(false);
-
- const resourceName = t("dynamic.resource.instance");
-
- const validate = useCallback(
- async (id: string): Promise<ValidatedMessage[]> => {
- const msgs: ValidatedMessage[] = [];
- if (id === "") {
- msgs.push({
- type: "error",
- message: t("resource-id.validation.empty", {
- resource: resourceName,
- }),
- });
- } else if (id.length > 64) {
- msgs.push({
- type: "error",
- message: t("resource-id.validation.overflow", {
- resource: resourceName,
- }),
- });
- } else if (!RESOURCE_ID_PATTERN.test(id)) {
- msgs.push({
- type: "error",
- message: t("resource-id.validation.pattern", {
- resource: resourceName,
- }),
- });
- }
-
- if (msgs.length === 0 && fetchResource && id && !readonly) {
- try {
- const resource = await fetchResource(id);
- if (resource) {
- msgs.push({
- type: "error",
- message: t("resource-id.validation.duplicated", {
- resource: resourceName,
- }),
- });
- }
- } catch {
- // NotFound = available, which is good
- }
- }
- return msgs;
- },
- [fetchResource, readonly, resourceName, t]
- );
-
- const handleResourceIdChange = useCallback(
- async (newValue: string) => {
- setResourceId(newValue);
- onChange(newValue);
- const msgs = await validate(newValue);
- setValidatedMessages(msgs);
- onValidationChange?.(msgs.length === 0 && newValue !== "");
- return msgs;
- },
- [onChange, validate, onValidationChange]
- );
-
- // Auto-generate from title (mirrors Vue watcher on resourceTitle)
- useEffect(() => {
- if (readonly || manualEdit) return;
-
- const escapedTitle = escapeResourceTitle(resourceTitle);
- const name = escapedTitle || "";
- if (!name) return;
-
- (async () => {
- const msgs = await handleResourceIdChange(name);
-
- // On first init, if duplicate, append random suffix
- if (!initializedRef.current) {
- if (msgs.length > 0) {
- await handleResourceIdChange(
- name + "-" + randomString(4).toLowerCase()
- );
- }
- }
- initializedRef.current = true;
- })();
- }, [resourceTitle]);
-
- if (readonly) {
- if (!resourceId) return null;
- return (
- <div className="sm:col-span-3 sm:col-start-1 -mt-4">
- <div className="mt-4 textinfolabel text-sm flex items-center gap-x-1">
- {t("resource-id.self", { resource: resourceName })}:{" "}
- <span className="text-control-light font-medium">{resourceId}</span>
- </div>
- </div>
- );
- }
-
- if (!manualEdit) {
- return (
- <div className="sm:col-span-3 sm:col-start-1 -mt-4">
- <div className="mt-4 textinfolabel text-sm flex items-start flex-wrap gap-x-1">
- <div className="flex items-center gap-x-1">
- {t("resource-id.self", { resource: resourceName })}:
- {resourceId ? (
- <span className="text-control-light font-medium mr-1">
- {resourceId}
- </span>
- ) : (
- <span className="text-control-placeholder italic">
- &lt;EMPTY&gt;
- </span>
- )}
- </div>
- <div>
- <span>{t("resource-id.cannot-be-changed-later")}</span>
- <span
- className="text-accent font-medium cursor-pointer hover:opacity-80 ml-1"
- onClick={() => setManualEdit(true)}
- >
- {t("common.edit")}
- </span>
- </div>
- </div>
- {validatedMessages.length > 0 && (
- <ul className="w-full my-2 flex flex-col gap-y-2 list-disc list-outside pl-4">
- {validatedMessages.map((msg) => (
- <li
- key={msg.message}
- className={`text-xs break-words ${
- msg.type === "warning" ? "text-warning" : "text-error"
- }`}
- >
- {msg.message}
- </li>
- ))}
- </ul>
- )}
- </div>
- );
- }
-
- return (
- <div className="sm:col-span-3 sm:col-start-1 -mt-4">
- <div className="mt-4">
- <label className="textlabel flex items-center">
- {t("resource-id.self", { resource: resourceName })}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <div className="textinfolabel mb-2 mt-1">
- {t("resource-id.description", { resource: resourceName })}
- </div>
- <Input
- value={resourceId}
- className={`w-full max-w-[40rem] ${
- validatedMessages.some((m) => m.type === "error")
- ? "border-error"
- : ""
- }`}
- placeholder={t("resource-id.self", { resource: resourceName })}
- onChange={(e) => {
- handleResourceIdChange(e.target.value);
- }}
- />
- </div>
- {validatedMessages.length > 0 && (
- <ul className="w-full my-2 flex flex-col gap-y-2 list-disc list-outside pl-4">
- {validatedMessages.map((msg) => (
- <li
- key={msg.message}
- className={`text-xs break-words ${
- msg.type === "warning" ? "text-warning" : "text-error"
- }`}
- >
- {msg.message}
- </li>
- ))}
- </ul>
- )}
- </div>
- );
-}
-
const MIN_SCAN_MINUTES = 30;
function ScanIntervalInput({
@@ -940,6 +703,35 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {
[setBasicInfo]
);
+ // Duplicate-instance check used by the shared ResourceIdField's `validate`
+ // callback. Tries to fetch the instance by ID; a successful fetch means the
+ // ID is taken. A NotFound (or any error) means the ID is available.
+ const validateInstanceId = useCallback(
+ async (id: string): Promise<ValidatedMessage[]> => {
+ if (!isCreating || !id) return [];
+ try {
+ const existing = await instanceV1Store.getOrFetchInstanceByName(
+ `${instanceNamePrefix}${id}`,
+ true /* silent */
+ );
+ if (existing) {
+ return [
+ {
+ type: "error",
+ message: t("resource-id.validation.duplicated", {
+ resource: t("common.instance"),
+ }),
+ },
+ ];
+ }
+ } catch {
+ // NotFound = available.
+ }
+ return [];
+ },
+ [instanceV1Store, isCreating, t]
+ );
+
const currentMongoDBConnectionSchema = useMemo(() => {
return adminDataSource.srv === false
? MongoDBConnectionStringSchemaList[0]
@@ -1396,17 +1188,14 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {
{/* Resource ID */}
<div className="sm:col-span-3 sm:col-start-1 -mt-4">
<ResourceIdField
+ suffix
value={resourceId}
- onChange={setResourceId}
- onValidationChange={setResourceIdValidated}
+ resourceName={t("common.instance")}
resourceTitle={basicInfo.title}
readonly={!isCreating}
- fetchResource={(id) =>
- instanceV1Store.getOrFetchInstanceByName(
- `${instanceNamePrefix}${id}`,
- true /* silent */
- )
- }
+ validate={validateInstanceId}
+ onChange={setResourceId}
+ onValidationChange={setResourceIdValidated}
/>
</div>
diff --git a/frontend/src/react/components/release/ReleaseFileDetailPanel.tsx b/frontend/src/react/components/release/ReleaseFileDetailPanel.tsx
index a3719b1fc6..1bfb2ad3e1 100644
--- a/frontend/src/react/components/release/ReleaseFileDetailPanel.tsx
+++ b/frontend/src/react/components/release/ReleaseFileDetailPanel.tsx
@@ -127,7 +127,8 @@ export function ReleaseFileDetailPanel({
) : (
<ReadonlyMonaco
content={statement}
- className="h-auto max-h-[480px] min-h-[120px] border border-control-border rounded-xs text-sm overflow-clip relative"
+ max={480}
+ className="border border-control-border rounded-xs text-sm overflow-clip relative"
/>
)}
</div>
diff --git a/frontend/src/react/components/sql-review/ReviewCreation.tsx b/frontend/src/react/components/sql-review/ReviewCreation.tsx
index 53f35f3924..ea035f4bba 100644
--- a/frontend/src/react/components/sql-review/ReviewCreation.tsx
+++ b/frontend/src/react/components/sql-review/ReviewCreation.tsx
@@ -333,7 +333,6 @@ export function ReviewCreation({
{/* Resource ID */}
<ResourceIdField
value={resourceId}
- resourceType="review-config"
resourceName={t("sql-review.review-policy")}
resourceTitle={policyName}
suffix
diff --git a/frontend/src/react/components/ui/toast.tsx b/frontend/src/react/components/ui/toast.tsx
index 0d6aed6566..669bbc0853 100644
--- a/frontend/src/react/components/ui/toast.tsx
+++ b/frontend/src/react/components/ui/toast.tsx
@@ -14,7 +14,7 @@ export type ToastVariant = "success" | "info" | "warning" | "error";
const toastRoot = [
"absolute right-0 bottom-0",
"w-(--toast-width) max-w-[calc(100vw-2rem)]",
- "rounded-md border bg-popover text-popover-foreground shadow-md",
+ "rounded-md border bg-background text-main shadow-md",
"px-4 py-3 pr-10",
// Base UI emits these CSS vars; we use them for the stack/expand transforms.
"transform [transition:transform_250ms,opacity_250ms]",
@@ -91,7 +91,7 @@ function ToastDescription({
<BaseToast.Description
{...props}
className={cn(
- "text-sm leading-5 text-muted-foreground whitespace-pre-wrap",
+ "text-sm leading-5 text-control-light whitespace-pre-wrap",
className
)}
/>
@@ -106,7 +106,7 @@ function ToastAction({
<BaseToast.Action
{...props}
className={cn(
- "mt-1 inline-flex w-fit text-sm font-medium text-accent hover:underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+ "mt-1 inline-flex w-fit text-sm font-medium text-accent hover:underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent",
className
)}
/>
@@ -123,7 +123,7 @@ function ToastClose({
{...props}
aria-label={ariaLabel ?? "Close"}
className={cn(
- "absolute right-2 top-2 inline-flex size-7 items-center justify-center rounded-sm text-muted-foreground opacity-60 transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+ "absolute right-2 top-2 inline-flex size-7 items-center justify-center rounded-sm text-control-light opacity-60 transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent",
className
)}
>
diff --git a/frontend/src/react/locales/dynamic/en-US.json b/frontend/src/react/locales/dynamic/en-US.json
index 73170c9b9e..529f926103 100644
--- a/frontend/src/react/locales/dynamic/en-US.json
+++ b/frontend/src/react/locales/dynamic/en-US.json
@@ -1,7 +1,4 @@
{
- "resource": {
- "instance": "Instance"
- },
"settings": {
"sensitive-data": {
"semantic-types": {
diff --git a/frontend/src/react/locales/dynamic/es-ES.json b/frontend/src/react/locales/dynamic/es-ES.json
index dfe8494bbb..aef78b8c38 100644
--- a/frontend/src/react/locales/dynamic/es-ES.json
+++ b/frontend/src/react/locales/dynamic/es-ES.json
@@ -1,7 +1,4 @@
{
- "resource": {
- "instance": "Instancia"
- },
"settings": {
"sensitive-data": {
"semantic-types": {
diff --git a/frontend/src/react/locales/dynamic/ja-JP.json b/frontend/src/react/locales/dynamic/ja-JP.json
index f7a6b19d50..ff85149ba2 100644
--- a/frontend/src/react/locales/dynamic/ja-JP.json
+++ b/frontend/src/react/locales/dynamic/ja-JP.json
@@ -1,7 +1,4 @@
{
- "resource": {
- "instance": "インスタンス"
- },
"settings": {
"sensitive-data": {
"semantic-types": {
diff --git a/frontend/src/react/locales/dynamic/vi-VN.json b/frontend/src/react/locales/dynamic/vi-VN.json
index f31a217639..dca5af5796 100644
--- a/frontend/src/react/locales/dynamic/vi-VN.json
+++ b/frontend/src/react/locales/dynamic/vi-VN.json
@@ -1,7 +1,4 @@
{
- "resource": {
- "instance": "Phiên bản"
- },
"settings": {
"sensitive-data": {
"semantic-types": {
diff --git a/frontend/src/react/locales/dynamic/zh-CN.json b/frontend/src/react/locales/dynamic/zh-CN.json
index 70e79bfa5c..09794a54d1 100644
--- a/frontend/src/react/locales/dynamic/zh-CN.json
+++ b/frontend/src/react/locales/dynamic/zh-CN.json
@@ -1,7 +1,4 @@
{
- "resource": {
- "instance": "实例"
- },
"settings": {
"sensitive-data": {
"semantic-types": {
diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.json
index c7b680cc04..f3666cbffa 100644
--- a/frontend/src/react/locales/en-US.json
+++ b/frontend/src/react/locales/en-US.json
@@ -916,7 +916,6 @@
"db.start-to-sync-schema": "Start to sync schema",
"db.successfully-synced-schema-for-database-database-value-name": "Successfully synced schema for database '{{0}}'.",
"db.syncing-databases-for-instance": "Syncing databases for {{0}}...",
- "dynamic.resource.instance": "Instance ID",
"environment": {
"delete-description": "Delete environment will also remove it from related instances and databases. You cannot undo this action",
"reorder": "Reorder Environments",
diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.json
index c20be87f08..f045807dd5 100644
--- a/frontend/src/react/locales/es-ES.json
+++ b/frontend/src/react/locales/es-ES.json
@@ -909,7 +909,6 @@
"db.start-to-sync-schema": "Comenzar a sincronizar el esquema",
"db.successfully-synced-schema-for-database-database-value-name": "Esquema sincronizado exitosamente para la base de datos '{{0}}'.",
"db.syncing-databases-for-instance": "Sincronizando bases de datos para {{0}}...",
- "dynamic.resource.instance": "ID de instancia",
"environment": {
"delete-description": "Eliminar el entorno también lo eliminará de las instancias y bases de datos relacionadas. No se puede deshacer esta acción",
"reorder": "Reordenar entornos",
diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.json
index 40f4b78f24..d75811c5ca 100644
--- a/frontend/src/react/locales/ja-JP.json
+++ b/frontend/src/react/locales/ja-JP.json
@@ -909,7 +909,6 @@
"db.start-to-sync-schema": "スキーマの同期を開始します",
"db.successfully-synced-schema-for-database-database-value-name": "データベース '{{0}}' のスキーマが正常に同期されました。",
"db.syncing-databases-for-instance": "{{0}} のデータベースを同期中...",
- "dynamic.resource.instance": "インスタンス ID",
"environment": {
"delete-description": "環境を削除すると、関連するインスタンスとデータベースからも削除されます。この操作は元に戻せません",
"reorder": "環境の並べ替え",
diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.json
index 9d773594e5..631877eb34 100644
--- a/frontend/src/react/locales/vi-VN.json
+++ b/frontend/src/react/locales/vi-VN.json
@@ -909,7 +909,6 @@
"db.start-to-sync-schema": "Bắt đầu đồng bộ hóa lược đồ",
"db.successfully-synced-schema-for-database-database-value-name": "Đồng bộ hóa lược đồ thành công cho cơ sở dữ liệu '{{0}}'.",
"db.syncing-databases-for-instance": "Đang đồng bộ hóa cơ sở dữ liệu cho {{0}}...",
- "dynamic.resource.instance": "ID phiên bản",
"environment": {
"delete-description": "Xóa môi trường cũng sẽ xóa nó khỏi các phiên bản và cơ sở dữ liệu liên quan. Bạn không thể hoàn tác hành động này.",
"reorder": "Sắp xếp lại môi trường",
diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.json
index 26aa9417b2..6370c3818c 100644
--- a/frontend/src/react/locales/zh-CN.json
+++ b/frontend/src/react/locales/zh-CN.json
@@ -909,7 +909,6 @@
"db.start-to-sync-schema": "开始同步 schema",
"db.successfully-synced-schema-for-database-database-value-name": "成功为数据库 '{{0}}' 同步 schema。",
"db.syncing-databases-for-instance": "正在同步 {{0}} 的数据库...",
- "dynamic.resource.instance": "实例 ID",
"environment": {
"delete-description": "删除环境也会将其从相关实例和数据库中删除。这个操作无法撤销",
"reorder": "重新排序环境",
diff --git a/frontend/src/react/pages/auth/SetupPage.tsx b/frontend/src/react/pages/auth/SetupPage.tsx
index e4a466771e..6ec75c17c5 100644
--- a/frontend/src/react/pages/auth/SetupPage.tsx
+++ b/frontend/src/react/pages/auth/SetupPage.tsx
@@ -268,10 +268,10 @@ function SetupWizard() {
onChange={(e) => setProjectTitle(e.target.value)}
/>
<ResourceIdField
+ suffix
ref={resourceFieldRef}
value={resourceId}
- resourceType="project"
- resourceName={projectTitle}
+ resourceName={t("common.project")}
resourceTitle={projectTitle}
validate={validateProjectResourceID}
onChange={setResourceId}
diff --git a/frontend/src/react/pages/settings/EnvironmentsPage.tsx b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
index 97486ef455..bc32c4195c 100644
--- a/frontend/src/react/pages/settings/EnvironmentsPage.tsx
+++ b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
@@ -865,7 +865,6 @@ function EnvironmentDetail({
/>
<ResourceIdField
value={environment.id}
- resourceType="environment"
resourceName={t("common.environment")}
readonly
/>
@@ -1168,7 +1167,6 @@ function CreateSheet({
/>
<ResourceIdField
value={resourceId}
- resourceType="environment"
resourceName={t("common.environment")}
resourceTitle={title}
validate={validateResourceId}
diff --git a/frontend/src/react/pages/settings/IDPDetailPage.tsx b/frontend/src/react/pages/settings/IDPDetailPage.tsx
index e958aa96be..02964ca27b 100644
--- a/frontend/src/react/pages/settings/IDPDetailPage.tsx
+++ b/frontend/src/react/pages/settings/IDPDetailPage.tsx
@@ -1502,10 +1502,10 @@ export function IDPDetailPage() {
/>
<div className="mt-1">
<ResourceIdField
- resourceType="idp"
+ suffix
+ resourceName="SSO"
readonly={true}
value={resourceId}
- resourceName={localIdp.name}
/>
</div>
</div>
diff --git a/frontend/src/react/pages/settings/IDPsPage.tsx b/frontend/src/react/pages/settings/IDPsPage.tsx
index 1231065b72..2e6af80121 100644
--- a/frontend/src/react/pages/settings/IDPsPage.tsx
+++ b/frontend/src/react/pages/settings/IDPsPage.tsx
@@ -1834,7 +1834,6 @@ function CreateWizardDrawer({
<ResourceIdField
ref={resourceIdFieldRef}
value={resourceId}
- resourceType="idp"
resourceName="SSO"
resourceTitle={title}
suffix
diff --git a/frontend/src/react/pages/settings/RolesPage.tsx b/frontend/src/react/pages/settings/RolesPage.tsx
index 1632b1b53c..f2afcf8aec 100644
--- a/frontend/src/react/pages/settings/RolesPage.tsx
+++ b/frontend/src/react/pages/settings/RolesPage.tsx
@@ -552,7 +552,6 @@ function RoleSheet({
<ResourceIdField
ref={resourceIdFieldRef}
value={resourceId}
- resourceType="role"
resourceName={t("role.self")}
resourceTitle={editRole.title}
suffix
@@ -564,7 +563,6 @@ function RoleSheet({
{mode === "EDIT" && !isBuiltin && (
<ResourceIdField
value={extractRoleResourceName(editRole.name)}
- resourceType="role"
resourceName={t("role.self")}
readonly
/>