Webfile fix for old data model file load (#688)

* Mimetype regression hotfix (#685)

* In case of multiple annotations/attachments associated with a  pick the latest modified by the user (#687)

Author: tyaginidhi

src/web/client/dal/remoteFetchProvider.ts

@@ -12,7 +12,7 @@ import {
     isWebfileContentLoadNeeded,
     setFileContent,
 } from "../utilities/commonUtil";
-import { getCustomRequestURL, getMappingEntityContent, getMappingEntityId, getRequestURL } from "../utilities/urlBuilderUtil";
+import { getCustomRequestURL, getMappingEntityContent, getMappingEntityId, getMimeType, getRequestURL } from "../utilities/urlBuilderUtil";
 import { getCommonHeaders } from "../common/authenticationProvider";
 import * as Constants from "../common/constants";
 import { ERRORS, showErrorDialog } from "../common/errorHandler";
@@ -413,6 +413,7 @@ async function createFile(
         attribute
     );
     let fileContent = Constants.NO_CONTENT;
+    let mimeType = undefined;
     let mappingEntityId = null
     // By default content is preloaded for all the files except for non-text webfiles for V2
     const isPreloadedContent = mappingEntityFetchQuery ? isWebfileContentLoadNeeded(fileNameWithExtension, fileUri) : true;
@@ -432,6 +433,7 @@ async function createFile(
             dataverseOrgUrl
         );
         mappingEntityId = getMappingEntityId(entityName, mappingContent);
+        mimeType = getMimeType(mappingContent);
         fileContent = getMappingEntityContent(entityName, mappingContent, attribute);
     } else {
         fileContent = GetFileContent(result, attributePath, entityName, entityId);
@@ -449,7 +451,7 @@ async function createFile(
         result[attributePath.source] ?? Constants.NO_CONTENT,
         fileExtension,
         result[Constants.ODATA_ETAG],
-        result[Constants.MIMETYPE],
+        mimeType ?? result[Constants.MIMETYPE],
         isPreloadedContent,
         mappingEntityId
     );
@@ -513,7 +515,7 @@ async function fetchMappingEntityContent(
 
     const result = await response.json();
     const data = result.value ?? result;
-    if (result[Constants.ODATA_COUNT] !== 0 && data.length === 1) {
+    if (result[Constants.ODATA_COUNT] !== 0 && data.length >= 1) {
         return data[0];
     }
 

src/web/client/schema/portalSchema.ts

@@ -108,7 +108,7 @@ export const portal_schema_V1 = {
                 _mappingEntityId: "annotationid", // Webfile in old schema are maintained with two dataverse entity adx_webfile and annotations. This Id acts as foreign key for that mapping
                 _mappingEntity: "annotations",
                 _mappingEntityFetchQuery: new Map([
-                    ["documentbody", "?$filter=_objectid_value eq {entityId} &$select=mimetype,documentbody,filename,annotationid,_objectid_value&$count=true"],
+                    ["documentbody", "?$filter=_objectid_value eq {entityId} &$select=mimetype,documentbody,filename,annotationid,_objectid_value &$count=true &$orderby=modifiedon desc"],
                 ]),
             },
             {

src/web/client/utilities/urlBuilderUtil.ts

@@ -4,6 +4,7 @@
  */
 
 import {
+    MIMETYPE,
     httpMethod,
     queryParameters,
 } from "../common/constants";
@@ -191,6 +192,12 @@ export function getMappingEntityContent(entity: string, result: any, attribute:
     return result;
 }
 
+// TODO - Make Json for different response type and update any here
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function getMimeType(result: any) {
+    return result[MIMETYPE];
+}
+
 export function pathHasEntityFolderName(uri: string): boolean {
     for (const entry of WebExtensionContext.entitiesFolderNameMap.entries()) {
         if (uri.includes(entry[1])) {