refactor: Add ADX_LANGUAGECODE and ADX_WEBSITE_LANGUAGE constants

microsoft · May 21, 2024 · 6ea0bfa · 6ea0bfa
1 parent 9717e15
commit 6ea0bfa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/common/copilot/constants.ts b/src/common/copilot/constants.ts
@@ -32,6 +32,8 @@ export const THUMBS_UP = 'thumbsUp';
 export const THUMBS_DOWN = 'thumbsDown';
 export const ADX_ENTITYFORM = "adx_entityform";
 export const ADX_ENTITYLIST = "adx_entitylist";
+export const ADX_LANGUAGECODE = "adx_languagecode";
+export const ADX_WEBSITE_LANGUAGE = "adx_website_language";
 export const ATTRIBUTE_DESCRIPTION = 'description';
 export const ATTRIBUTE_DATAFIELD_NAME = 'datafieldname';
 export const ATTRIBUTE_CLASSID = 'classid';

diff --git a/src/common/copilot/dataverseMetadata.ts b/src/common/copilot/dataverseMetadata.ts
@@ -12,9 +12,8 @@ import { sendTelemetryEvent } from "./telemetry/copilotTelemetry";
 import { CopilotDataverseMetadataFailureEvent, CopilotDataverseMetadataSuccessEvent, CopilotGetEntityFailureEvent, CopilotGetLanguageCodeFailureEvent, CopilotGetLanguageCodeSuccessEvent, CopilotYamlParsingFailureEvent } from "./telemetry/telemetryConstants";
 import { getEntityMetadata, getDefaultLanguageCodeWeb } from "../../web/client/utilities/fileAndEntityUtil";
 import { DOMParser } from "@xmldom/xmldom";
-import { ATTRIBUTE_CLASSID, ATTRIBUTE_DATAFIELD_NAME, ATTRIBUTE_DESCRIPTION, ControlClassIdMap, SYSTEFORMS_API_PATH } from "./constants";
+import { ADX_LANGUAGECODE, ADX_WEBSITE_LANGUAGE, ATTRIBUTE_CLASSID, ATTRIBUTE_DATAFIELD_NAME, ATTRIBUTE_DESCRIPTION, ControlClassIdMap, SYSTEFORMS_API_PATH } from "./constants";
 import { findWebsiteYAML, getUserAgent } from "../utilities/Utils";
-import { EntityMetadataKeyAdx } from "../../web/client/schema/constants";
 
 
 declare const IS_DESKTOP: string | undefined;
@@ -260,7 +259,7 @@ async function fetchLanguageCodeId(): Promise<string> {
         const yamlContent = await readWebsiteYAML(activeFilePath);
         if (yamlContent) {
             const parsedYAML = yaml.parse(yamlContent);
-            const languageCodeId = parsedYAML[EntityMetadataKeyAdx.LANGUAGE_ID];
+            const languageCodeId = parsedYAML[ADX_WEBSITE_LANGUAGE];
             return languageCodeId;
         } else {
             return "";
@@ -311,7 +310,7 @@ async function fetchLanguageCodeFromAPI(
             orgUrl: orgUrl,
         });
 
-        return matchingLanguage?.[EntityMetadataKeyAdx.LANGUAGE_NAME_CODE] ?? vscode.env.language;
+        return matchingLanguage?.[ADX_LANGUAGECODE] ?? vscode.env.language;
     } catch (error) {
         sendTelemetryEvent(telemetry, {
             eventName: CopilotGetLanguageCodeFailureEvent,

diff --git a/src/web/client/schema/constants.ts b/src/web/client/schema/constants.ts
@@ -87,6 +87,4 @@ export enum EntityMetadataKeyCore {
 export enum EntityMetadataKeyAdx {
     ENTITY_LOGICAL_NAME = "adx_entityname",
     FORM_LOGICAL_NAME = "adx_formname",
-    LANGUAGE_NAME_CODE = "adx_languagecode",
-    LANGUAGE_ID = "adx_website_language"
 }