Merge branch 'main' into users/priyanshuag/2-mdiff-tree-view

Author: priyanshu92

src/web/client/schema/constants.ts

@@ -90,6 +90,7 @@ export enum folderExportType {
 export enum entityAttributesWithBase64Encoding {
     documentbody = "documentbody",
     filecontent = "filecontent",
+    adx_filecontent = "adx_filecontent",
 }
 
 export enum EntityMetadataKeyCore {

src/web/client/schema/portalSchema.ts

@@ -117,17 +117,17 @@ export const portal_schema_V1 = {
                 _displayname: "Server Logic",
                 _etc: "11398",
                 _primaryidfield: "adx_serverlogicid",
-                _primarynamefield: "name",
+                _primarynamefield: "adx_name",
                 _disableplugins: "true",
                 _foldername: "server-logics",
                 _exporttype: "SingleFolder",
                 _fetchQueryParameters:
-                    "?$filter=adx_serverlogicid eq {entityId} &$select=name",
-                _multiFileFetchQueryParameters: "?$filter=_website_value eq {websiteId} &$select=adx_serverlogicid,name,filecontent&$count=true",
-                _attributes: "filecontent",
-                _attributesExtension: new Map([["filecontent", "js"]]),
+                    "?$filter=adx_serverlogicid eq {entityId} &$select=adx_name",
+                _multiFileFetchQueryParameters: "?$filter=_adx_websiteid_value eq {websiteId} &$select=adx_serverlogicid,adx_name,adx_filecontent&$count=true",
+                _attributes: "adx_filecontent",
+                _attributesExtension: new Map([["adx_filecontent", "js"]]),
                 _mappingEntityFetchQuery: new Map([
-                    ["filecontent", "({entityId})/filecontent"],
+                    ["adx_filecontent", "({entityId})/adx_filecontent"],
                 ]),
             },
             {

src/web/client/utilities/schemaHelperUtil.ts

@@ -68,7 +68,8 @@ export function isBase64Encoded(
     return (
         (entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
         (attributeType === entityAttributesWithBase64Encoding.documentbody ||
-            attributeType === entityAttributesWithBase64Encoding.filecontent)
+            attributeType === entityAttributesWithBase64Encoding.filecontent ||
+            attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
     );
 }
 
@@ -85,14 +86,16 @@ export function useOctetStreamContentType(
 ) {
     return (
         (entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
-        attributeType === entityAttributesWithBase64Encoding.filecontent
+        (attributeType === entityAttributesWithBase64Encoding.filecontent ||
+            attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
     );
 }
 
 export function isWebFileV2(entity: string, attributeType: string) {
     return (
         (entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
-        attributeType === entityAttributesWithBase64Encoding.filecontent
+        (attributeType === entityAttributesWithBase64Encoding.filecontent ||
+            attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
     );
 }
 

src/web/client/utilities/urlBuilderUtil.ts

@@ -152,7 +152,8 @@ export function getPatchRequestUrl(
     requestUrl: string
 ) {
     return (entity === schemaEntityName.WEBFILES || entity === schemaEntityName.SERVERLOGICS) &&
-        attributeType === entityAttributesWithBase64Encoding.filecontent
+        (attributeType === entityAttributesWithBase64Encoding.filecontent ||
+            attributeType === entityAttributesWithBase64Encoding.adx_filecontent)
         ? requestUrl + "/" + attributeType
         : requestUrl;
 }