Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: fix instance label inconsistent behavior (#17680)
Vincent Huang0b81118d3b9e
diff --git a/frontend/src/components/InstanceForm/Buttons.vue b/frontend/src/components/InstanceForm/Buttons.vueindex 163d9ca2db..8061beda24 100644--- a/frontend/src/components/InstanceForm/Buttons.vue+++ b/frontend/src/components/InstanceForm/Buttons.vue@@ -73,7 +73,7 @@ import {InstanceSchema,} from "@/types/proto-es/v1/instance_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { defer, isValidSpannerHost } from "@/utils";+import { defer, isValidSpannerHost, convertKVListToLabels } from "@/utils";import ScanIntervalInput from "./ScanIntervalInput.vue";import {calcDataSourceUpdateMask,@@ -106,6 +106,7 @@ const {allowEdit,allowCreate,basicInfo,+ labelKVList,adminDataSource,readonlyDataSourceList,dataSourceEditState,@@ -353,9 +354,11 @@ const doUpdate = async () => {const pendingRequestRunners: (() => Promise<any>)[] = [];const maybeQueueUpdateInstanceBasicInfo = () => {+ const currentLabels = convertKVListToLabels(labelKVList.value, false);const instancePatch = create(InstanceSchema, {...instance,...basicInfo.value,+ labels: currentLabels,});const updateMask: string[] = [];if (instancePatch.title !== inst.title) {diff --git a/frontend/src/components/InstanceForm/Form.vue b/frontend/src/components/InstanceForm/Form.vueindex 2937728cdf..566580d4ce 100644--- a/frontend/src/components/InstanceForm/Form.vue+++ b/frontend/src/components/InstanceForm/Form.vue@@ -429,9 +429,10 @@</label><div class="mt-1"><LabelListEditor+ ref="labelListEditorRef"v-model:kv-list="labelKVList":readonly="!allowEdit"- :show-errors="false"+ :show-errors="true"/></div></div>@@ -552,8 +553,6 @@ import {autoSubscriptionRoute,urlfy,supportedEngineV1List,- convertLabelsToKVList,- convertKVListToLabels,} from "@/utils";import LearnMoreLink from "../LearnMoreLink.vue";import BigQueryHostInput from "./BigQueryHostInput.vue";@@ -584,6 +583,8 @@ const {allowCreate,resourceIdField,basicInfo,+ labelListEditorRef,+ labelKVList,adminDataSource,editingDataSource,testConnection,@@ -622,16 +623,6 @@ const resourceId = computed({},});-// Convert labels to KVList format for LabelListEditor-const labelKVList = computed({- get() {- return convertLabelsToKVList(basicInfo.value.labels, true /* sort */);- },- set(kvList) {- basicInfo.value.labels = convertKVListToLabels(kvList, false);- },-});-const currentMongoDBConnectionSchema = computed(() => {return adminDataSource.value.srv === false? MongoDBConnectionStringSchemaList[0]diff --git a/frontend/src/components/InstanceForm/context.ts b/frontend/src/components/InstanceForm/context.tsindex 9664b14e0b..5520715454 100644--- a/frontend/src/components/InstanceForm/context.ts+++ b/frontend/src/components/InstanceForm/context.ts@@ -4,7 +4,7 @@ import Emittery from "emittery";import { cloneDeep, isEqual, omit } from "lodash-es";import { useDialog } from "naive-ui";import type { InjectionKey, Ref } from "vue";-import { computed, inject, provide, ref } from "vue";+import { computed, inject, provide, ref, watch } from "vue";import { useI18n } from "vue-i18n";import { instanceServiceClientConnect } from "@/grpcweb";import { silentContextKey } from "@/grpcweb/context-key";@@ -36,8 +36,11 @@ import {extractInstanceResourceName,hasWorkspacePermissionV2,isValidSpannerHost,+ convertLabelsToKVList,+ convertKVListToLabels,} from "@/utils";import { extractGrpcErrorMessage } from "@/utils/grpcweb";+import type { LabelListEditor } from "../Label";import type { ResourceIdField } from "../v2";import type { EditDataSource } from "./common";import {@@ -87,6 +90,18 @@ export const provideInstanceFormContext = (baseContext: {const basicInfo = ref(extractBasicInfo(instance.value));const dataSourceEditState = ref(extractDataSourceEditState(instance.value));+ const labelListEditorRef = ref<InstanceType<typeof LabelListEditor>>();+ const labelKVList = ref(+ convertLabelsToKVList(basicInfo.value.labels, true /* sort */)+ );++ watch(+ () => basicInfo.value.labels,+ (newLabels) => {+ labelKVList.value = convertLabelsToKVList(newLabels, true /* sort */);+ }+ );+const adminDataSource = computed(() => {return dataSourceEditState.value.dataSources.find((ds) => ds.type === DataSourceType.ADMIN@@ -242,10 +257,14 @@ export const provideInstanceFormContext = (baseContext: {}}+ const hasLabelErrors =+ (labelListEditorRef.value?.flattenErrors ?? []).length > 0;+return (!!basicInfo.value.title.trim() &&resourceIdField.value?.isValidated &&- checkDataSource([adminDataSource.value])+ checkDataSource([adminDataSource.value]) &&+ !hasLabelErrors);});@@ -311,9 +330,10 @@ export const provideInstanceFormContext = (baseContext: {};const pendingCreateInstance = computed(() => {- // When creating new instance, use the adminDataSource.+ const currentLabels = convertKVListToLabels(labelKVList.value, false);const instance: Instance = create(InstanceSchema, {...basicInfo.value,+ labels: currentLabels,engineVersion: "",dataSources: [],});@@ -444,8 +464,12 @@ export const provideInstanceFormContext = (baseContext: {basicInfo: extractBasicInfo(instance.value),dataSources: extractDataSourceEditState(instance.value).dataSources,};+ const currentLabels = convertKVListToLabels(labelKVList.value, false);const editing = {- basicInfo: basicInfo.value,+ basicInfo: {+ ...basicInfo.value,+ labels: currentLabels,+ },dataSources: dataSourceEditState.value.dataSources,};return !isEqual(editing, original);@@ -463,6 +487,8 @@ export const provideInstanceFormContext = (baseContext: {resourceIdField,environment,basicInfo,+ labelListEditorRef,+ labelKVList,dataSourceEditState,adminDataSource,editingDataSource,