box-ui-elements 24.0.0-beta.6 → 24.0.0-beta.8

package/i18n/fr-FR.properties

@@ -977,7 +977,7 @@ boxui.classification.add = Ajouter
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI sur {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Classement
 # Classification label color name as dark blue

package/i18n/hi-IN.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "जानकारी",
   "boxui.classification.add": "जोड़ें",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "{modifiedAt} पर Box AI",
   "boxui.classification.classification": "वर्गीकरण",
   "boxui.classification.classificationDarkBlue": "गहरा नीला",
   "boxui.classification.classificationGreen": "हरा",

package/i18n/hi-IN.properties

@@ -977,7 +977,7 @@ boxui.classification.add = जोड़ें
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = {modifiedAt} पर Box AI
 # Header for classification section in sidebar
 boxui.classification.classification = वर्गीकरण
 # Classification label color name as dark blue

package/i18n/it-IT.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "Informazioni",
   "boxui.classification.add": "Aggiungi",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI su {modifiedAt}",
   "boxui.classification.classification": "Classificazione",
   "boxui.classification.classificationDarkBlue": "Blu scuro",
   "boxui.classification.classificationGreen": "Verde",

package/i18n/it-IT.properties

@@ -977,7 +977,7 @@ boxui.classification.add = Aggiungi
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI su {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Classificazione
 # Classification label color name as dark blue

package/i18n/ko-KR.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "정보",
   "boxui.classification.add": "추가",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "{modifiedAt}의 Box AI 분류 사유",
   "boxui.classification.classification": "분류",
   "boxui.classification.classificationDarkBlue": "진한 파란색",
   "boxui.classification.classificationGreen": "녹색",

package/i18n/ko-KR.properties

@@ -977,7 +977,7 @@ boxui.classification.add = 추가
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = {modifiedAt}의 Box AI 분류 사유
 # Header for classification section in sidebar
 boxui.classification.classification = 분류
 # Classification label color name as dark blue

package/i18n/nb-NO.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "Informasjon",
   "boxui.classification.add": "Legg til",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI på {modifiedAt}",
   "boxui.classification.classification": "Klassifisering",
   "boxui.classification.classificationDarkBlue": "Mørkeblå",
   "boxui.classification.classificationGreen": "Grønn",

package/i18n/nb-NO.properties

@@ -977,7 +977,7 @@ boxui.classification.add = Legg til
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI på {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Klassifisering
 # Classification label color name as dark blue

package/i18n/nl-NL.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "Info",
   "boxui.classification.add": "Toevoegen",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI op {modifiedAt}",
   "boxui.classification.classification": "Classificatie",
   "boxui.classification.classificationDarkBlue": "Donkerblauw",
   "boxui.classification.classificationGreen": "Groen",

package/i18n/nl-NL.properties

@@ -977,7 +977,7 @@ boxui.classification.add = Toevoegen
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI op {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Classificatie
 # Classification label color name as dark blue

package/i18n/pl-PL.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "Informacje",
   "boxui.classification.add": "Dodaj",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI w dniu {modifiedAt}",
   "boxui.classification.classification": "Klasyfikacja",
   "boxui.classification.classificationDarkBlue": "Ciemnoniebieski",
   "boxui.classification.classificationGreen": "Zielony",

package/i18n/pl-PL.properties

@@ -977,7 +977,7 @@ boxui.classification.add = Dodaj
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI w dniu {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Klasyfikacja
 # Classification label color name as dark blue

package/i18n/pt-BR.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "Informações",
   "boxui.classification.add": "Adicionar",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI no {modifiedAt}",
   "boxui.classification.classification": "Classificação",
   "boxui.classification.classificationDarkBlue": "Azul escuro",
   "boxui.classification.classificationGreen": "Verde",

package/i18n/pt-BR.properties

@@ -977,7 +977,7 @@ boxui.classification.add = Adicionar
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI no {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Classificação
 # Classification label color name as dark blue

package/i18n/ru-RU.js

@@ -487,8 +487,8 @@ export default {
   "boxui.categorySelector.label.more": "Дополнительно",
   "boxui.checkboxTooltip.iconInfoText": "Информация",
   "boxui.classification.add": "Добавить",
-  "boxui.classification.appliedByBoxAi": "ИИ Box",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAi": "Box AI",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI на {modifiedAt}",
   "boxui.classification.classification": "Классификация",
   "boxui.classification.classificationDarkBlue": "Темно-синий",
   "boxui.classification.classificationGreen": "Зеленый",

package/i18n/ru-RU.properties

@@ -975,9 +975,9 @@ boxui.checkboxTooltip.iconInfoText = Информация
 # Button to add classification on an item
 boxui.classification.add = Добавить
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
-boxui.classification.appliedByBoxAi = ИИ Box
+boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI на {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Классификация
 # Classification label color name as dark blue

package/i18n/sv-SE.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "Info",
   "boxui.classification.add": "Lägg till",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI på {modifiedAt}",
   "boxui.classification.classification": "Klassificering",
   "boxui.classification.classificationDarkBlue": "Mörkblått",
   "boxui.classification.classificationGreen": "Grön",

package/i18n/sv-SE.properties

@@ -977,7 +977,7 @@ boxui.classification.add = Lägg till
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI på {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = Klassificering
 # Classification label color name as dark blue

package/i18n/tr-TR.js

@@ -487,8 +487,8 @@ export default {
   "boxui.categorySelector.label.more": "Daha fazla",
   "boxui.checkboxTooltip.iconInfoText": "Bilgi",
   "boxui.classification.add": "Ekle",
-  "boxui.classification.appliedByBoxAi": "Box IA",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAi": "Box AI",
+  "boxui.classification.appliedByBoxAiOnDate": "{modifiedAt} bilgisine ayarlı Box AI",
   "boxui.classification.classification": "Sınıflandırma",
   "boxui.classification.classificationDarkBlue": "Koyu Mavi",
   "boxui.classification.classificationGreen": "Yeşil",

package/i18n/tr-TR.properties

@@ -975,9 +975,9 @@ boxui.checkboxTooltip.iconInfoText = Bilgi
 # Button to add classification on an item
 boxui.classification.add = Ekle
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
-boxui.classification.appliedByBoxAi = Box IA
+boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = {modifiedAt} bilgisine ayarlı Box AI
 # Header for classification section in sidebar
 boxui.classification.classification = Sınıflandırma
 # Classification label color name as dark blue

package/i18n/zh-CN.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "信息",
   "boxui.classification.add": "添加",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI 于 {modifiedAt}",
   "boxui.classification.classification": "分类",
   "boxui.classification.classificationDarkBlue": "深蓝色",
   "boxui.classification.classificationGreen": "绿色",

package/i18n/zh-CN.properties

@@ -977,7 +977,7 @@ boxui.classification.add = 添加
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI 于 {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = 分类
 # Classification label color name as dark blue

package/i18n/zh-TW.js

@@ -488,7 +488,7 @@ export default {
   "boxui.checkboxTooltip.iconInfoText": "資訊",
   "boxui.classification.add": "新增",
   "boxui.classification.appliedByBoxAi": "Box AI",
-  "boxui.classification.appliedByBoxAiOnDate": "Box AI on {modifiedAt}",
+  "boxui.classification.appliedByBoxAiOnDate": "Box AI 已修改於 {modifiedAt}",
   "boxui.classification.classification": "分類",
   "boxui.classification.classificationDarkBlue": "深藍色",
   "boxui.classification.classificationGreen": "綠色",

package/i18n/zh-TW.properties

@@ -977,7 +977,7 @@ boxui.classification.add = 新增
 # Title of the card that shows the reason why the AI classification was applied when no date is available.
 boxui.classification.appliedByBoxAi = Box AI
 # Title of the card that shows the reason why the AI classification was applied on a specific date.
-boxui.classification.appliedByBoxAiOnDate = Box AI on {modifiedAt}
+boxui.classification.appliedByBoxAiOnDate = Box AI 已修改於 {modifiedAt}
 # Header for classification section in sidebar
 boxui.classification.classification = 分類
 # Classification label color name as dark blue

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "box-ui-elements",
-    "version": "24.0.0-beta.6",
+    "version": "24.0.0-beta.8",
     "description": "Box UI Elements",
     "author": "Box (https://www.box.com/)",
     "license": "SEE LICENSE IN LICENSE",

package/src/elements/content-explorer/ContentExplorer.tsx

@@ -34,7 +34,7 @@ import Content from './Content';
 import { isThumbnailAvailable } from '../common/utils';
 import { isFocusableElement, isInputElement, focus } from '../../utils/dom';
 import { FILE_SHARED_LINK_FIELDS_TO_FETCH } from '../../utils/fields';
-import CONTENT_EXPLORER_FOLDER_FIELDS_TO_FETCH from './constants';
+import { CONTENT_EXPLORER_FOLDER_FIELDS_TO_FETCH } from './constants';
 import LocalStore from '../../utils/LocalStore';
 import {
     withFeatureConsumer,

package/src/elements/content-explorer/MetadataQueryAPIHelper.ts

@@ -172,17 +172,11 @@ export default class MetadataQueryAPIHelper {
     };
 
     getTemplateSchemaInfo = (data: MetadataQueryResponseData): Promise<MetadataTemplateSchemaResponse | void> => {
-        const { entries } = data;
         this.metadataQueryResponseData = data;
-        if (!entries || entries.length === 0) {
-            // Don't make metadata API call to get template info
-            return Promise.resolve();
-        }
 
-        const metadata = getProp(entries, '[0].metadata');
-        this.templateScope = Object.keys(metadata)[0];
-        const instance = metadata[this.templateScope];
-        this.templateKey = Object.keys(instance)[0];
+        const [scope, key] = this.metadataQuery.from.split('.');
+        this.templateScope = scope;
+        this.templateKey = key;
 
         return this.api.getMetadataAPI(true).getSchemaByTemplateKey(this.templateKey);
     };

package/src/elements/content-explorer/MetadataQueryBuilder.ts

@@ -1,4 +1,5 @@
 import isNil from 'lodash/isNil';
+import { getFileExtensions } from './utils';
 
 type QueryResult = {
     queryParams: { [key: string]: number | Date | string };
@@ -115,9 +116,7 @@ export const getSelectFilter = (filterValue: string[], fieldKey: string, argInde
     return {
         queryParams: multiSelectQueryParams,
         queries: [
-            `(${fieldKey === 'mimetype-filter' ? 'item.extension' : fieldKey} HASANY (${Object.keys(
-                multiSelectQueryParams,
-            )
+            `(${fieldKey} HASANY (${Object.keys(multiSelectQueryParams)
                 .map(argKey => `:${argKey}`)
                 .join(', ')}))`,
         ],
@@ -135,25 +134,49 @@ export const getMimeTypeFilter = (filterValue: string[], fieldKey: string, argIn
     }
 
     let currentArgIndex = argIndexStart;
-
-    const multiSelectQueryParams = Object.fromEntries(
-        filterValue.map(value => {
+    const queryParams: { [key: string]: number | Date | string } = {};
+    const queries: string[] = [];
+
+    // Handle specific extensions and folder type
+    const extensions: string[][] = [];
+    let hasFolder = false;
+    for (const extension of filterValue) {
+        if (extension === 'folderType' && !hasFolder) {
             currentArgIndex += 1;
-            // the item-type-selector is returning the extensions with the suffix 'Type', so we remove it for the query
-            return [
-                generateArgKey(fieldKey, currentArgIndex),
-                String(value.endsWith('Type') ? value.slice(0, -4) : value),
-            ];
-        }),
-    );
+            const folderArgKey = generateArgKey('mime_folderType', currentArgIndex);
+            queryParams[folderArgKey] = 'folder';
+            queries.push(`(item.type = :${folderArgKey})`);
+            hasFolder = true;
+        } else {
+            extensions.push(getFileExtensions(extension));
+        }
+    }
 
-    return {
-        queryParams: multiSelectQueryParams,
-        queries: [
-            `(item.extension IN (${Object.keys(multiSelectQueryParams)
+    // flat the array of arrays
+    const flattenExtensions = extensions.flat();
+    // Handle extensions in batch if any exist
+    if (flattenExtensions.length > 0) {
+        const extensionQueryParams = Object.fromEntries(
+            flattenExtensions.map(extension => {
+                currentArgIndex += 1;
+                return [generateArgKey(fieldKey, currentArgIndex), extension];
+            }),
+        );
+
+        Object.assign(queryParams, extensionQueryParams);
+        queries.push(
+            `(item.extension IN (${Object.keys(extensionQueryParams)
                 .map(argKey => `:${argKey}`)
                 .join(', ')}))`,
-        ],
+        );
+    }
+
+    // Combine queries with OR if multiple exist
+    const finalQueries = queries.length > 1 ? [`(${queries.join(' OR ')})`] : queries;
+
+    return {
+        queryParams,
+        queries: finalQueries,
         keysGenerated: currentArgIndex - argIndexStart,
     };
 };

package/src/elements/content-explorer/__tests__/MetadataQueryAPIHelper.test.ts

@@ -189,14 +189,14 @@ describe('elements/content-explorer/MetadataQueryAPIHelper', () => {
     };
     const mdQuery = {
         ancestor_folder_id: '672838458',
-        from: 'enterprise_1234.templateKey',
+        from: `${templateScope}.${templateKey}`,
         query: 'query',
         query_params: {},
         fields: [
             FIELD_ITEM_NAME,
-            'metadata.enterprise_1234.templateKey.type',
-            'metadata.enterprise_1234.templateKey.year',
-            'metadata.enterprise_1234.templateKey.approved',
+            `metadata.${templateScope}.${templateKey}.type`,
+            `metadata.${templateScope}.${templateKey}.year`,
+            `metadata.${templateScope}.${templateKey}.approved`,
         ],
     };
 
@@ -206,6 +206,10 @@ describe('elements/content-explorer/MetadataQueryAPIHelper', () => {
         metadataQueryAPIHelper.templateScope = templateScope;
         metadataQueryAPIHelper.metadataTemplate = template;
         metadataQueryAPIHelper.metadataQuery = mdQuery;
+
+        // Reset mocks before each test
+        getSchemaByTemplateKeyFunc.mockClear();
+        getSchemaByTemplateKeyFunc.mockResolvedValue(templateSchemaResponse);
     });
 
     describe('flattenMetadata()', () => {
@@ -267,7 +271,7 @@ describe('elements/content-explorer/MetadataQueryAPIHelper', () => {
     });
 
     describe('getTemplateSchemaInfo()', () => {
-        test('should set instance properties and make xhr call to get template info when response has valid entries', async () => {
+        test('should set instance properties and make xhr call to get template info', async () => {
             const result = await metadataQueryAPIHelper.getTemplateSchemaInfo(metadataQueryResponse);
             expect(getSchemaByTemplateKeyFunc).toHaveBeenCalledWith(templateKey);
             expect(result).toEqual(templateSchemaResponse);
@@ -276,26 +280,49 @@ describe('elements/content-explorer/MetadataQueryAPIHelper', () => {
             expect(metadataQueryAPIHelper.templateKey).toEqual(templateKey);
         });
 
-        test('should not make xhr call to get metadata template info when response has zero/invalid entries', async () => {
+        test('should make xhr call to get metadata template info even when response has zero entries', async () => {
             const emptyEntriesResponse = { entries: [], next_marker: nextMarker };
             const result = await metadataQueryAPIHelper.getTemplateSchemaInfo(emptyEntriesResponse);
-            expect(getSchemaByTemplateKeyFunc).not.toHaveBeenCalled();
-            expect(result).toBe(undefined);
+            expect(getSchemaByTemplateKeyFunc).toHaveBeenCalledWith(templateKey);
+            expect(result).toEqual(templateSchemaResponse);
             expect(metadataQueryAPIHelper.metadataQueryResponseData).toEqual(emptyEntriesResponse);
+            expect(metadataQueryAPIHelper.templateScope).toEqual(templateScope);
+            expect(metadataQueryAPIHelper.templateKey).toEqual(templateKey);
         });
 
-        test('should handle response with null entries', async () => {
+        test('should make xhr call to get metadata template info even when response has null entries', async () => {
             const nullEntriesResponse = { entries: null, next_marker: nextMarker };
             const result = await metadataQueryAPIHelper.getTemplateSchemaInfo(nullEntriesResponse);
-            expect(getSchemaByTemplateKeyFunc).not.toHaveBeenCalled();
-            expect(result).toBe(undefined);
+            expect(getSchemaByTemplateKeyFunc).toHaveBeenCalledWith(templateKey);
+            expect(result).toEqual(templateSchemaResponse);
+            expect(metadataQueryAPIHelper.metadataQueryResponseData).toEqual(nullEntriesResponse);
+            expect(metadataQueryAPIHelper.templateScope).toEqual(templateScope);
+            expect(metadataQueryAPIHelper.templateKey).toEqual(templateKey);
         });
 
-        test('should handle response with undefined entries', async () => {
+        test('should make xhr call to get metadata template info even when response has undefined entries', async () => {
             const undefinedEntriesResponse = { next_marker: nextMarker };
             const result = await metadataQueryAPIHelper.getTemplateSchemaInfo(undefinedEntriesResponse);
-            expect(getSchemaByTemplateKeyFunc).not.toHaveBeenCalled();
-            expect(result).toBe(undefined);
+            expect(getSchemaByTemplateKeyFunc).toHaveBeenCalledWith(templateKey);
+            expect(result).toEqual(templateSchemaResponse);
+            expect(metadataQueryAPIHelper.metadataQueryResponseData).toEqual(undefinedEntriesResponse);
+            expect(metadataQueryAPIHelper.templateScope).toEqual(templateScope);
+            expect(metadataQueryAPIHelper.templateKey).toEqual(templateKey);
+        });
+
+        test('should extract template scope and key from metadata query from field', async () => {
+            // Test with different scope and key in the query
+            const differentScope = 'enterprise_99999';
+            const differentKey = 'differentTemplate';
+            metadataQueryAPIHelper.metadataQuery = {
+                ...mdQuery,
+                from: `${differentScope}.${differentKey}`,
+            };
+
+            await metadataQueryAPIHelper.getTemplateSchemaInfo(metadataQueryResponse);
+            expect(getSchemaByTemplateKeyFunc).toHaveBeenCalledWith(differentKey);
+            expect(metadataQueryAPIHelper.templateScope).toEqual(differentScope);
+            expect(metadataQueryAPIHelper.templateKey).toEqual(differentKey);
         });
     });
 
@@ -673,14 +700,20 @@ describe('elements/content-explorer/MetadataQueryAPIHelper', () => {
             const filters = {
                 'mimetype-filter': {
                     fieldType: 'enum',
-                    value: ['pdf', 'doc'],
+                    value: ['pdfType', 'documentType'],
                 },
             };
 
             const result = metadataQueryAPIHelper.buildMetadataQueryParams(filters);
-            expect(result.query).toBe('(item.extension IN (:arg_mimetype_filter_1, :arg_mimetype_filter_2))');
+            expect(result.query).toBe(
+                '(item.extension IN (:arg_mimetype_filter_1, :arg_mimetype_filter_2, :arg_mimetype_filter_3, :arg_mimetype_filter_4, :arg_mimetype_filter_5, :arg_mimetype_filter_6))',
+            );
             expect(result.queryParams.arg_mimetype_filter_1).toBe('pdf');
             expect(result.queryParams.arg_mimetype_filter_2).toBe('doc');
+            expect(result.queryParams.arg_mimetype_filter_3).toBe('docx');
+            expect(result.queryParams.arg_mimetype_filter_4).toBe('gdoc');
+            expect(result.queryParams.arg_mimetype_filter_5).toBe('rtf');
+            expect(result.queryParams.arg_mimetype_filter_6).toBe('txt');
         });
 
         test('should handle multiple filters of different types', () => {