Skip to content

Commit db26a8b

Browse files
Amit Joshiclaude
andcommitted
Rename server-logics to server-logic in web extension
Remove trailing 's' from the server-logics folder name and related constants/enums to use singular form (server-logic) consistently. Only VS Code-side naming is affected; Dataverse entity names remain unchanged. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent c16a2a7 commit db26a8b

10 files changed

Lines changed: 24 additions & 24 deletions

File tree

src/common/copilot/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export const DataverseEntityNameMap = new Map<string, string>([
5050
['webtemplate', 'adx_webtemplate'],
5151
['basicform', 'adx_entityform'],
5252
['advancedformstep', 'adx_entityform'],
53-
['serverlogics', 'server-logics'],
53+
['serverlogic', 'server-logic'],
5454
]);
5555

5656
export const EntityFieldMap = new Map<string, string>([

src/web/client/common/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,5 @@ export const WEB_EXTENSION_QUICK_PICK_PLACEHOLDER = "Search for people";
143143
export const WEB_EXTENSION_COLLABORATION_OPTIONS_CONTACT = "Contact";
144144

145145
//Business logic constants
146-
export const SERVERLOGICS = "server-logics";
146+
export const SERVERLOGIC = "server-logic";
147147
export const SERVERLOGIC_FILE_EXTENSION = ".serverlogic.customjs.js";

src/web/client/dal/fileSystemProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
PORTALS_URI_SCHEME,
1111
queryParameters,
1212
REFERRER,
13-
SERVERLOGICS,
13+
SERVERLOGIC,
1414
} from "../common/constants";
1515
import WebExtensionContext from "../WebExtensionContext";
1616
import { fetchDataFromDataverseAndUpdateVFS } from "./remoteFetchProvider";
@@ -234,7 +234,7 @@ export class PortalsFS implements vscode.FileSystemProvider {
234234
const dirname = uri.with({ path: path.posix.dirname(uri.path) });
235235
const parent = await this._lookupAsDirectory(dirname, false);
236236

237-
if (basename === SERVERLOGICS && !enableServerLogicChanges) {
237+
if (basename === SERVERLOGIC && !enableServerLogicChanges) {
238238
return; // Do not create the directory if the server logic is disabled
239239
}
240240

src/web/client/dal/remoteFetchProvider.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export async function fetchDataFromDataverseAndUpdateVFS(
7373

7474
await Promise.all(entityRequestURLs.map(async (entity) => {
7575
const startTime = new Date().getTime();
76-
if(entity.entityName != schemaEntityName.SERVERLOGICS || featureFlags.enableServerLogicChanges) {
76+
if(entity.entityName != schemaEntityName.SERVERLOGIC || featureFlags.enableServerLogicChanges) {
7777
await fetchFromDataverseAndCreateFiles(entity.entityName, entity.requestUrl, dataverseOrgUrl, portalFs, defaultFileInfo, featureFlags);
7878

7979
if (defaultFileInfo === undefined) { // This will be undefined for bulk entity load
@@ -470,8 +470,8 @@ async function processDataAndCreateFile(
470470
else {
471471
let fileCreationValid = true;
472472
let fileNameWithExtension = GetFileNameWithExtension(entityName, fileName, languageCode, fileExtension);
473-
if (entityName === schemaEntityName.SERVERLOGICS) {
474-
// Modify filename for serverlogics: test.js -> test.serverlogics.customjs.js
473+
if (entityName === schemaEntityName.SERVERLOGIC) {
474+
// Modify filename for serverlogic: test.js -> test.serverlogic.customjs.js
475475
if (fileNameWithExtension.endsWith('.js')) {
476476
const baseName = fileNameWithExtension.slice(0, -3); // Remove .js
477477
fileNameWithExtension = `${baseName}${Constants.SERVERLOGIC_FILE_EXTENSION}`;
@@ -667,7 +667,7 @@ async function fetchMappingEntityContent(
667667
// Gracefully handle 404 for optional entities (deleted/moved files or missing server logic)
668668
const notFoundTelemetryMap = new Map<string, string>([
669669
[schemaEntityName.WEBFILES, webExtensionTelemetryEventNames.WEB_EXTENSION_WEBFILE_NOT_FOUND],
670-
[schemaEntityName.SERVERLOGICS, webExtensionTelemetryEventNames.WEB_EXTENSION_SERVERLOGIC_NOT_FOUND],
670+
[schemaEntityName.SERVERLOGIC, webExtensionTelemetryEventNames.WEB_EXTENSION_SERVERLOGIC_NOT_FOUND],
671671
]);
672672

673673
if (!response.ok && response.status === 404 && notFoundTelemetryMap.has(entity)) {
@@ -704,7 +704,7 @@ async function fetchMappingEntityContent(
704704
const result = await response.json();
705705
const data = result.value ?? result;
706706

707-
if(entity === schemaEntityName.SERVERLOGICS) {
707+
if(entity === schemaEntityName.SERVERLOGIC) {
708708
return data || Constants.NO_CONTENT;
709709
}
710710
if (isPortalVersionV1() && result[Constants.ODATA_COUNT] > 0 && data.length > 0) {

src/web/client/dal/remoteSaveProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ async function getSaveParameters(
9292
);
9393
if (webFileV2) {
9494
let fileName = fileDataMap.get(fileUri.fsPath)?.fileName as string;
95-
if (entityName === MultiFileSupportedEntityName.SERVERLOGICS && fileName && !fileName.endsWith('.sl')) {
95+
if (entityName === MultiFileSupportedEntityName.SERVERLOGIC && fileName && !fileName.endsWith('.sl')) {
9696
// Handle filenames like test.serverlogic.customjs.js -> extract base name (test) and append .sl
9797
let baseName = fileName;
9898
// Remove .serverlogic.customjs.js if present
@@ -168,7 +168,7 @@ async function saveDataToDataverse(
168168
let fileExtensionType = fileDataMap.get(
169169
fileUri.fsPath
170170
)?.entityFileExtensionType;
171-
if(entityName == MultiFileSupportedEntityName.SERVERLOGICS ) {
171+
if(entityName == MultiFileSupportedEntityName.SERVERLOGIC ) {
172172
fileExtensionType = 'sl';
173173
}
174174

src/web/client/schema/constants.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export enum schemaEntityName {
4646
WEBFILES = "webfiles",
4747
WEBPAGES = "webpages",
4848
WEBTEMPLATES = "webtemplates",
49-
SERVERLOGICS = "serverlogics",
49+
SERVERLOGIC = "serverlogic",
5050
CONTENTSNIPPETS = "contentsnippet",
5151
LISTS = "lists",
5252
BASICFORMS = "basicforms",
@@ -63,7 +63,7 @@ export enum schemaEntityName {
6363
export enum MultiFileSupportedEntityName {
6464
WEBFILES = "webfiles",
6565
WEBPAGES = "webpages",
66-
SERVERLOGICS = "serverlogics",
66+
SERVERLOGIC = "serverlogic",
6767
WEBTEMPLATES = "webtemplates",
6868
CONTENTSNIPPETS = "contentsnippet",
6969
LISTS = "lists",
@@ -122,5 +122,5 @@ export const conditionalFolderEntities = [
122122
schemaEntityName.IDEAFORUMS,
123123
schemaEntityName.FORUMANNOUNCEMENTS,
124124
schemaEntityName.FORUMPOSTS,
125-
schemaEntityName.SERVERLOGICS,
125+
schemaEntityName.SERVERLOGIC,
126126
];

src/web/client/schema/portalSchema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ export const portal_schema_V1 = {
109109
},
110110
{
111111
relationships: "",
112-
_vscodeentityname: "serverlogics",
112+
_vscodeentityname: "serverlogic",
113113
_dataverseenityname: "adx_serverlogics",
114114
_displayname: "Server Logic",
115115
_etc: "11398",
116116
_primaryidfield: "adx_serverlogicid",
117117
_primarynamefield: "adx_name",
118118
_disableplugins: "true",
119-
_foldername: "server-logics",
119+
_foldername: "server-logic",
120120
_exporttype: "SingleFolder",
121121
_fetchQueryParameters:
122122
"?$filter=adx_serverlogicid eq {entityId} &$select=adx_name",
@@ -450,15 +450,15 @@ export const portal_schema_V2 = {
450450
},
451451
{
452452
relationships: "",
453-
_vscodeentityname: "serverlogics",
453+
_vscodeentityname: "serverlogic",
454454
_dataverseenityname: "powerpagecomponents",
455455
_displayname: "Server Logic",
456456
_etc: "10271",
457457
_primaryidfield: "powerpagecomponentid",
458458
_primarynamefield: "name",
459459
_disableplugins: "false",
460460
_exporttype: "SingleFolder",
461-
_foldername: "server-logics",
461+
_foldername: "server-logic",
462462
_fetchQueryParameters:
463463
"?$filter=powerpagecomponentid eq {entityId}&$select=name",
464464
_multiFileFetchQueryParameters:

src/web/client/utilities/commonUtil.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export function isExtensionNeededInFileName(entity: string) {
6363
|| entity === schemaEntityName.BASICFORMS
6464
|| entity === schemaEntityName.WEBPAGES
6565
|| entity === schemaEntityName.CONTENTSNIPPETS
66-
|| entity === schemaEntityName.SERVERLOGICS
66+
|| entity === schemaEntityName.SERVERLOGIC
6767
|| entity === schemaEntityName.BLOGS
6868
|| entity === schemaEntityName.BLOGPOSTS
6969
|| entity === schemaEntityName.IDEAS

src/web/client/utilities/schemaHelperUtil.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export function isBase64Encoded(
6565
attributeType: string
6666
): boolean {
6767
return (
68-
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
68+
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGIC) &&
6969
(attributeType === entityAttributesWithBase64Encoding.documentbody ||
7070
attributeType === entityAttributesWithBase64Encoding.filecontent ||
7171
attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
@@ -74,7 +74,7 @@ export function isBase64Encoded(
7474

7575
export function encodeAsBase64(entity: string, attributeType: string): boolean {
7676
return (
77-
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
77+
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGIC) &&
7878
attributeType === entityAttributesWithBase64Encoding.documentbody
7979
);
8080
}
@@ -84,15 +84,15 @@ export function useOctetStreamContentType(
8484
attributeType: string
8585
) {
8686
return (
87-
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
87+
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGIC) &&
8888
(attributeType === entityAttributesWithBase64Encoding.filecontent ||
8989
attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
9090
);
9191
}
9292

9393
export function isWebFileV2(entity: string, attributeType: string) {
9494
return (
95-
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
95+
(entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGIC) &&
9696
(attributeType === entityAttributesWithBase64Encoding.filecontent ||
9797
attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
9898
);

src/web/client/utilities/urlBuilderUtil.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export function getPatchRequestUrl(
146146
attributeType: string,
147147
requestUrl: string
148148
) {
149-
return (entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
149+
return (entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGIC) &&
150150
(attributeType === entityAttributesWithBase64Encoding.filecontent ||
151151
attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
152152
? requestUrl + "/" + attributeType

0 commit comments

Comments
 (0)