@oat-sa/tao-core-ui 3.24.2 → 3.24.4

package/dist/resourcemgr/assetSearch.js

@@ -95,7 +95,6 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
       const $error = $$1('.asset-search-error', $fileSelector);
       const $errorMessage = $$1('.asset-search-error-message', $error);
       const $retry = $$1('.asset-search-retry', $error);
-      const $resultsRegion = $$1('.files-wrapper', $fileSelector);
       const $paginationContainer = $$1('.pagination-bottom', $container);
       const $uploadSwitcher = $$1('.upload-switcher', $fileSelector);
       const $modalTitle = $container.closest('.resourcemgr').find('> h2').first();
@@ -169,8 +168,9 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
        * Keeps the previous display name until a real label arrives (avoids URI flash).
        * @param {string} [folderLabel]
        * @param {Object} [content]
+       * @param {boolean} [includesSubfolders]
        */
-      function updateScopeDisplay(folderLabel, content) {
+      function updateScopeDisplay(folderLabel, content, includesSubfolders) {
         if (isFolderDisplayLabel(folderLabel)) {
           scopeLabel = String(folderLabel).trim();
         }
@@ -181,7 +181,8 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
         } else {
           $scopeName.removeAttr('title');
         }
-        if (folderHasSubfolders(content)) {
+        const showSubfolders = includesSubfolders !== false && folderHasSubfolders(content);
+        if (showSubfolders) {
           $scopeSubfolders.removeClass('hidden').removeAttr('hidden');
         } else {
           $scopeSubfolders.addClass('hidden').attr('hidden', 'hidden');
@@ -457,6 +458,7 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
        * Detach asset-search handlers and destroy Advanced Search.
        */
       function teardown() {
+        setResultsTableLoading(false);
         requestSeq += 1;
         searchMode = false;
         $fileSelector.removeClass('search-mode');
@@ -591,6 +593,7 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
         if ($modalTitle.length && browseModalTitle) {
           $modalTitle.text(browseModalTitle);
         }
+        setResultsTableLoading(false);
         hideLoading();
         hideError();
         $paginationContainer.empty();
@@ -601,9 +604,12 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
       }
 
       /**
-       * Execute the scoped search request.
-       * @param {{quiet?: boolean}} [runOptions]
+       * Toggle the file-table loading overlay during search (including pagination).
+       * @param {Boolean} loading
        */
+      function setResultsTableLoading(loading) {
+        $container.trigger(`searchtableloading.${ns}`, [!!loading]);
+      }
       function runSearch(runOptions) {
         if (!hasActiveSearch()) {
           exitSearchMode();
@@ -611,9 +617,8 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
         }
         const quiet = Boolean(runOptions && runOptions.quiet);
         const seq = ++requestSeq;
-        if (quiet) {
-          $resultsRegion.attr('aria-busy', 'true');
-        } else {
+        setResultsTableLoading(true);
+        if (!quiet) {
           showLoading();
         }
         hideError();
@@ -637,9 +642,8 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
           if (seq !== requestSeq) {
             return;
           }
-          if (quiet) {
-            $resultsRegion.attr('aria-busy', 'false');
-          } else {
+          setResultsTableLoading(false);
+          if (!quiet) {
             hideLoading();
           }
           let normalized = assetSearchContract.normalizeSearchResponse(response);
@@ -668,6 +672,7 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
           total = normalized.total;
           page = normalized.page;
           pageSize = normalized.pageSize;
+          updateScopeDisplay(scopeLabel, null, normalized.includesSubfolders);
           let emptyMessage = '';
           if (normalized.total === 0) {
             if (normalized.metadataUnsupported) {
@@ -693,19 +698,18 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
             emptyMessage
           }]);
           renderPagination();
-        }).fail(function () {
+        }).fail(function (jqXHR) {
           if (seq !== requestSeq) {
             return;
           }
-          if (quiet) {
-            $resultsRegion.attr('aria-busy', 'false');
-          } else {
+          setResultsTableLoading(false);
+          if (!quiet) {
             hideLoading();
           }
           page = 1;
           total = 0;
           $paginationContainer.empty();
-          const message = __('Unable to search assets. Please try again.');
+          const message = assetSearchContract.resolveServiceUnavailableSearchMessage(jqXHR, __('Unable to search assets. Please try again.'));
           showError(message);
           $container.trigger(`searchresults.${ns}`, [{
             query,
@@ -755,7 +759,6 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
         $searchButton.prop('disabled', true).addClass('is-searching').attr('aria-busy', 'true');
         $searchButtonSpinner.removeClass('hidden');
         $searchButtonLabel.text(__('Searching'));
-        $resultsRegion.attr('aria-busy', 'true');
       }
 
       /**
@@ -766,7 +769,6 @@ define(['jquery', 'i18n', 'ui/pagination', 'ui/searchModal/advancedSearch', 'han
         $searchButton.removeClass('is-searching').attr('aria-busy', 'false');
         $searchButtonSpinner.addClass('hidden');
         $searchButtonLabel.text(__('Search'));
-        $resultsRegion.attr('aria-busy', 'false');
         updateSearchActionState();
       }
 

package/dist/resourcemgr/assetSearchContract.js

@@ -271,10 +271,36 @@ define(['exports'], function (exports) { 'use strict';
         items,
         total,
         page: Number.isFinite(page) && page > 0 ? page : 1,
-        pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE
+        pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE,
+        includesSubfolders: body.includesSubfolders !== false
       };
     }
 
+    /**
+     * Prefer a server-provided 503 message when the search service is unavailable.
+     *
+     * @param {*} jqXHR
+     * @param {string} fallbackMessage
+     * @returns {string}
+     */
+    function resolveServiceUnavailableSearchMessage(jqXHR, fallbackMessage) {
+      if (!jqXHR || jqXHR.status !== 503) {
+        return fallbackMessage;
+      }
+      let body = jqXHR.responseJSON;
+      if (!body && jqXHR.responseText) {
+        try {
+          body = typeof jqXHR.responseText === 'string' ? JSON.parse(jqXHR.responseText) : jqXHR.responseText;
+        } catch (err) {
+          body = null;
+        }
+      }
+      if (body && body.message) {
+        return body.message;
+      }
+      return fallbackMessage;
+    }
+
     /**
      * Browse (`ItemContent/files`) responses use `children` and ignore `query`.
      * Real search responses expose `items`.
@@ -498,6 +524,7 @@ define(['exports'], function (exports) { 'use strict';
     exports.isBrowseShapedSearchPayload = isBrowseShapedSearchPayload;
     exports.isMetadataCriterionComplete = isMetadataCriterionComplete;
     exports.normalizeSearchResponse = normalizeSearchResponse;
+    exports.resolveServiceUnavailableSearchMessage = resolveServiceUnavailableSearchMessage;
     exports.sortAssetItems = sortAssetItems;
 
     Object.defineProperty(exports, '__esModule', { value: true });

package/dist/resourcemgr/fileBrowser.js

@@ -325,7 +325,7 @@ define(['jquery', 'lodash', 'ui/pagination', 'handlebars', 'lib/handlebars/helpe
 	  });
 
 	  //load the content of the ROOT
-	  const showInitialListLoading = !searchMode && root === 'local';
+	  const showInitialListLoading = !searchMode;
 	  if (showInitialListLoading) {
 	    setFilesLoading(true);
 	  }
@@ -775,6 +775,9 @@ define(['jquery', 'lodash', 'ui/pagination', 'handlebars', 'lib/handlebars/helpe
 	      const needTree = !existing || !existing.children && !existing.empty;
 	      const cacheKey = listCacheKey();
 	      const needList = !existing || existing.listCacheKey !== cacheKey;
+	      if (needList && !searchMode) {
+	        setFilesLoading(true);
+	      }
 	      const treePromise = needTree ? (setTreeLoading(true), browseRequest(path, {
 	        part: 'tree',
 	        depth: 1,
@@ -803,6 +806,9 @@ define(['jquery', 'lodash', 'ui/pagination', 'handlebars', 'lib/handlebars/helpe
 	        }
 	        cb(getByExactPath(tree, path) || getByPath(tree, path));
 	      }).catch(function () {
+	        if (!searchMode) {
+	          setFilesLoading(false);
+	        }
 	        cb(null);
 	      });
 	      return;

package/dist/resourcemgr/fileSelector.js

@@ -352,6 +352,9 @@ define(['jquery', 'lodash', 'async', 'i18n', 'core/mimetype', 'handlebars', 'lib
         }
         applyFilesListLoading(loading);
       });
+      $container.on(`searchtableloading.${ns}`, function (e, loading) {
+        applyFilesListLoading(loading);
+      });
 
       //update current folder
       $container.on(`folderselect.${ns}`, function (e, fullPath, data, activePath, content) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "3.24.2",
+    "version": "3.24.4",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {

package/src/resourcemgr/assetSearch.js

@@ -40,7 +40,8 @@ import {
     buildSearchRequestParams,
     canSubmitScopedAssetSearch,
     isBrowseShapedSearchPayload,
-    normalizeSearchResponse
+    normalizeSearchResponse,
+    resolveServiceUnavailableSearchMessage
 } from 'ui/resourcemgr/assetSearchContract';
 import 'ui/searchModal/css/advancedSearch.css';
 
@@ -99,7 +100,6 @@ export default function assetSearch(options) {
     const $error = $('.asset-search-error', $fileSelector);
     const $errorMessage = $('.asset-search-error-message', $error);
     const $retry = $('.asset-search-retry', $error);
-    const $resultsRegion = $('.files-wrapper', $fileSelector);
     const $paginationContainer = $('.pagination-bottom', $container);
     const $uploadSwitcher = $('.upload-switcher', $fileSelector);
     const $modalTitle = $container.closest('.resourcemgr').find('> h2').first();
@@ -177,8 +177,9 @@ export default function assetSearch(options) {
      * Keeps the previous display name until a real label arrives (avoids URI flash).
      * @param {string} [folderLabel]
      * @param {Object} [content]
+     * @param {boolean} [includesSubfolders]
      */
-    function updateScopeDisplay(folderLabel, content) {
+    function updateScopeDisplay(folderLabel, content, includesSubfolders) {
         if (isFolderDisplayLabel(folderLabel)) {
             scopeLabel = String(folderLabel).trim();
         }
@@ -189,7 +190,9 @@ export default function assetSearch(options) {
         } else {
             $scopeName.removeAttr('title');
         }
-        if (folderHasSubfolders(content)) {
+        const showSubfolders =
+            includesSubfolders !== false && folderHasSubfolders(content);
+        if (showSubfolders) {
             $scopeSubfolders.removeClass('hidden').removeAttr('hidden');
         } else {
             $scopeSubfolders.addClass('hidden').attr('hidden', 'hidden');
@@ -500,6 +503,7 @@ export default function assetSearch(options) {
      * Detach asset-search handlers and destroy Advanced Search.
      */
     function teardown() {
+        setResultsTableLoading(false);
         requestSeq += 1;
         searchMode = false;
         $fileSelector.removeClass('search-mode');
@@ -637,6 +641,7 @@ export default function assetSearch(options) {
         if ($modalTitle.length && browseModalTitle) {
             $modalTitle.text(browseModalTitle);
         }
+        setResultsTableLoading(false);
         hideLoading();
         hideError();
         $paginationContainer.empty();
@@ -648,9 +653,13 @@ export default function assetSearch(options) {
     }
 
     /**
-     * Execute the scoped search request.
-     * @param {{quiet?: boolean}} [runOptions]
+     * Toggle the file-table loading overlay during search (including pagination).
+     * @param {Boolean} loading
      */
+    function setResultsTableLoading(loading) {
+        $container.trigger(`searchtableloading.${ns}`, [!!loading]);
+    }
+
     function runSearch(runOptions) {
         if (!hasActiveSearch()) {
             exitSearchMode();
@@ -659,9 +668,8 @@ export default function assetSearch(options) {
 
         const quiet = Boolean(runOptions && runOptions.quiet);
         const seq = ++requestSeq;
-        if (quiet) {
-            $resultsRegion.attr('aria-busy', 'true');
-        } else {
+        setResultsTableLoading(true);
+        if (!quiet) {
             showLoading();
         }
         hideError();
@@ -688,9 +696,8 @@ export default function assetSearch(options) {
                 if (seq !== requestSeq) {
                     return;
                 }
-                if (quiet) {
-                    $resultsRegion.attr('aria-busy', 'false');
-                } else {
+                setResultsTableLoading(false);
+                if (!quiet) {
                     hideLoading();
                 }
                 let normalized = normalizeSearchResponse(response);
@@ -719,6 +726,7 @@ export default function assetSearch(options) {
                 total = normalized.total;
                 page = normalized.page;
                 pageSize = normalized.pageSize;
+                updateScopeDisplay(scopeLabel, null, normalized.includesSubfolders);
 
                 let emptyMessage = '';
                 if (normalized.total === 0) {
@@ -749,19 +757,21 @@ export default function assetSearch(options) {
 
                 renderPagination();
             })
-            .fail(function () {
+            .fail(function (jqXHR) {
                 if (seq !== requestSeq) {
                     return;
                 }
-                if (quiet) {
-                    $resultsRegion.attr('aria-busy', 'false');
-                } else {
+                setResultsTableLoading(false);
+                if (!quiet) {
                     hideLoading();
                 }
                 page = 1;
                 total = 0;
                 $paginationContainer.empty();
-                const message = __('Unable to search assets. Please try again.');
+                const message = resolveServiceUnavailableSearchMessage(
+                    jqXHR,
+                    __('Unable to search assets. Please try again.')
+                );
                 showError(message);
                 $container.trigger(`searchresults.${ns}`, [
                     {
@@ -813,7 +823,6 @@ export default function assetSearch(options) {
         $searchButton.prop('disabled', true).addClass('is-searching').attr('aria-busy', 'true');
         $searchButtonSpinner.removeClass('hidden');
         $searchButtonLabel.text(__('Searching'));
-        $resultsRegion.attr('aria-busy', 'true');
     }
 
     /**
@@ -824,7 +833,6 @@ export default function assetSearch(options) {
         $searchButton.removeClass('is-searching').attr('aria-busy', 'false');
         $searchButtonSpinner.addClass('hidden');
         $searchButtonLabel.text(__('Search'));
-        $resultsRegion.attr('aria-busy', 'false');
         updateSearchActionState();
     }
 

package/src/resourcemgr/assetSearchContract.js

@@ -279,10 +279,37 @@ export function normalizeSearchResponse(payload) {
         items,
         total,
         page: Number.isFinite(page) && page > 0 ? page : 1,
-        pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE
+        pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : DEFAULT_PAGE_SIZE,
+        includesSubfolders: body.includesSubfolders !== false
     };
 }
 
+/**
+ * Prefer a server-provided 503 message when the search service is unavailable.
+ *
+ * @param {*} jqXHR
+ * @param {string} fallbackMessage
+ * @returns {string}
+ */
+export function resolveServiceUnavailableSearchMessage(jqXHR, fallbackMessage) {
+    if (!jqXHR || jqXHR.status !== 503) {
+        return fallbackMessage;
+    }
+    let body = jqXHR.responseJSON;
+    if (!body && jqXHR.responseText) {
+        try {
+            body =
+                typeof jqXHR.responseText === 'string' ? JSON.parse(jqXHR.responseText) : jqXHR.responseText;
+        } catch (err) {
+            body = null;
+        }
+    }
+    if (body && body.message) {
+        return body.message;
+    }
+    return fallbackMessage;
+}
+
 /**
  * Browse (`ItemContent/files`) responses use `children` and ignore `query`.
  * Real search responses expose `items`.

package/src/resourcemgr/fileBrowser.js

@@ -154,7 +154,7 @@ export default function (options) {
     });
 
     //load the content of the ROOT
-    const showInitialListLoading = !searchMode && root === 'local';
+    const showInitialListLoading = !searchMode;
     if (showInitialListLoading) {
         setFilesLoading(true);
     }
@@ -421,14 +421,14 @@ export default function (options) {
         $container.data('activeFileBrowserRoot', root);
         if (searchMode) {
             $container.trigger(`folderpath.${NS}`, [path, content.label]);
-        $container.trigger(`folderselect.${NS}`, [
-            content.label,
-            getFilesForDisplay(content),
-            path,
-            content
-        ]);
-        return;
-    }
+            $container.trigger(`folderselect.${NS}`, [
+                content.label,
+                getFilesForDisplay(content),
+                path,
+                content
+            ]);
+            return;
+        }
         updateSelectedClass(path, content.total, content.childrenLimit);
         $container.trigger(`folderpath.${NS}`, [path, content.label]);
         $container.trigger(`folderselect.${NS}`, [
@@ -657,6 +657,10 @@ export default function (options) {
             const cacheKey = listCacheKey();
             const needList = !existing || existing.listCacheKey !== cacheKey;
 
+            if (needList && !searchMode) {
+                setFilesLoading(true);
+            }
+
             const treePromise = needTree
                 ? (setTreeLoading(true),
                 browseRequest(path, {
@@ -697,6 +701,9 @@ export default function (options) {
                     cb(getByExactPath(tree, path) || getByPath(tree, path));
                 })
                 .catch(function () {
+                    if (!searchMode) {
+                        setFilesLoading(false);
+                    }
                     cb(null);
                 });
             return;

package/src/resourcemgr/fileSelector.js

@@ -181,6 +181,10 @@ export default function (options) {
         applyFilesListLoading(loading);
     });
 
+    $container.on(`searchtableloading.${ns}`, function (e, loading) {
+        applyFilesListLoading(loading);
+    });
+
     //update current folder
     $container.on(`folderselect.${ns}`, function (e, fullPath, data, activePath, content) {
         let files;