@oat-sa/tao-core-ui 3.24.1 → 3.24.3

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

@@ -56,6 +56,14 @@ define(['exports'], function (exports) { 'use strict';
      */
     const MIN_TEXT_QUERY_LENGTH = 3;
 
+    /**
+     * @param {*} entry
+     * @returns {boolean}
+     */
+    function isNonemptyCriterionValue(entry) {
+      return entry !== '' && entry !== null && typeof entry !== 'undefined';
+    }
+
     /**
      * Whether a rendered metadata criterion has a usable value.
      * @param {Object} criterion
@@ -72,9 +80,7 @@ define(['exports'], function (exports) { 'use strict';
         if (!Array.isArray(criterion.value)) {
           return false;
         }
-        return criterion.value.some(function (entry) {
-          return entry !== '' && entry !== null && typeof entry !== 'undefined';
-        });
+        return criterion.value.some(isNonemptyCriterionValue);
       }
       return true;
     }
@@ -187,10 +193,8 @@ define(['exports'], function (exports) { 'use strict';
           return;
         }
         if (criterion.type === 'list' && Array.isArray(criterion.value)) {
-          const first = criterion.value.find(function (entry) {
-            return entry !== '' && entry !== null && typeof entry !== 'undefined';
-          });
-          if (typeof first !== 'undefined' && first !== null && first !== '') {
+          const first = criterion.value.find(isNonemptyCriterionValue);
+          if (isNonemptyCriterionValue(first)) {
             metadata[criterion.propertyUri] = String(first);
           }
         }
@@ -216,6 +220,31 @@ define(['exports'], function (exports) { 'use strict';
       return normalized;
     }
 
+    /**
+     * @param {number} [requestedPageSize]
+     * @param {number} [normalizedPageSize]
+     * @returns {number}
+     */
+    function resolveSearchPageSize(requestedPageSize, normalizedPageSize) {
+      const requested = Number(requestedPageSize);
+      if (requested > 0) {
+        return requested;
+      }
+      const fallback = Number(normalizedPageSize);
+      if (fallback > 0) {
+        return fallback;
+      }
+      return DEFAULT_PAGE_SIZE;
+    }
+
+    /**
+     * @param {{field: string, direction: string}} [sort]
+     * @returns {{field: string, direction: string}}
+     */
+    function mergeSortWithDefaults(sort) {
+      return Object.assign({}, DEFAULT_SORT, sort || {});
+    }
+
     /**
      * Normalize a search service payload into a stable picker shape.
      *
@@ -242,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`.
@@ -273,8 +328,8 @@ define(['exports'], function (exports) { 'use strict';
      */
     function applyLocalSearchFallback(normalized, options) {
       const metadata = normalizeMetadataMap(options && options.metadata);
+      const pageSize = resolveSearchPageSize(options && options.pageSize, normalized.pageSize);
       if (Object.keys(metadata).length) {
-        const pageSize = Number(options && options.pageSize) > 0 ? Number(options.pageSize) : normalized.pageSize || DEFAULT_PAGE_SIZE;
         return {
           items: [],
           total: 0,
@@ -284,8 +339,7 @@ define(['exports'], function (exports) { 'use strict';
         };
       }
       const query = String(options && options.query || '').trim().toLowerCase();
-      const sort = options && options.sort || DEFAULT_SORT;
-      const pageSize = Number(options && options.pageSize) > 0 ? Number(options.pageSize) : normalized.pageSize || DEFAULT_PAGE_SIZE;
+      const sort = mergeSortWithDefaults(options && options.sort);
       const page = Number(options && options.page) > 0 ? Number(options.page) : 1;
       let items = (normalized.items || []).filter(isSearchableAsset);
       if (query) {
@@ -414,7 +468,7 @@ define(['exports'], function (exports) { 'use strict';
      * @returns {Array}
      */
     function sortAssetItems(items, sort) {
-      const resolved = Object.assign({}, DEFAULT_SORT, sort || {});
+      const resolved = mergeSortWithDefaults(sort);
       return (items || []).slice().sort(function (a, b) {
         const primary = compareSortValues(getSortValue(a, resolved.field), getSortValue(b, resolved.field), resolved.direction);
         if (primary !== 0) {
@@ -470,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/css/resourcemgr.css

@@ -298,7 +298,7 @@ Usage:
   font-size: 1.2rem;
   display: inline-block;
   margin: 0;
-  color: #626262;
+  color: rgb(38.3333333333%, 38.3333333333%, 38.3333333333%);
   font-weight: normal;
   flex: 0 1 auto;
   min-width: 0;
@@ -321,7 +321,7 @@ Usage:
   max-width: 100%;
   flex: 0 1 auto;
   overflow: hidden;
-  color: #626262;
+  color: rgb(38.3333333333%, 38.3333333333%, 38.3333333333%);
   line-height: 1.6;
   font-weight: normal;
 }
@@ -471,7 +471,7 @@ Usage:
   content: "·";
   display: inline-block;
   margin: 0 6px;
-  color: #aeaeae;
+  color: rgb(68.3333333333%, 68.3333333333%, 68.3333333333%);
 }
 .resourcemgr .file-browser .asset-search .applied-filters-summary.hidden {
   display: none;
@@ -660,7 +660,7 @@ Usage:
   line-height: 1.3;
 }
 .resourcemgr .file-browser .asset-search .filter-spoiler-body .select2-container-multi .select2-choices .select2-search-choice.select2-search-choice-focus {
-  background-color: #dbd9d7;
+  background-color: rgb(85.7647058824%, 85.0588235294%, 84.3529411765%);
 }
 .resourcemgr .file-browser .asset-search .filter-spoiler-body .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close {
   background-image: none !important;
@@ -774,8 +774,8 @@ Usage:
 }
 .resourcemgr .file-browser .asset-search-actions .asset-search-submit:disabled, .resourcemgr .file-browser .asset-search-actions .asset-search-submit[disabled] {
   color: #ffffff;
-  background-color: #aeaeae;
-  border-color: #aeaeae;
+  background-color: rgb(68.3333333333%, 68.3333333333%, 68.3333333333%);
+  border-color: rgb(68.3333333333%, 68.3333333333%, 68.3333333333%);
   cursor: not-allowed;
   opacity: 1;
   text-shadow: none;
@@ -783,8 +783,8 @@ Usage:
 }
 .resourcemgr .file-browser .asset-search-actions .asset-search-submit:disabled:hover, .resourcemgr .file-browser .asset-search-actions .asset-search-submit:disabled:focus, .resourcemgr .file-browser .asset-search-actions .asset-search-submit:disabled:active, .resourcemgr .file-browser .asset-search-actions .asset-search-submit[disabled]:hover, .resourcemgr .file-browser .asset-search-actions .asset-search-submit[disabled]:focus, .resourcemgr .file-browser .asset-search-actions .asset-search-submit[disabled]:active {
   color: #ffffff;
-  background-color: #aeaeae;
-  border-color: #aeaeae;
+  background-color: rgb(68.3333333333%, 68.3333333333%, 68.3333333333%);
+  border-color: rgb(68.3333333333%, 68.3333333333%, 68.3333333333%);
   opacity: 1;
 }
 .resourcemgr .file-browser .asset-search-actions .asset-search-submit.is-searching, .resourcemgr .file-browser .asset-search-actions .asset-search-submit.is-searching:disabled, .resourcemgr .file-browser .asset-search-actions .asset-search-submit.is-searching[disabled] {
@@ -896,7 +896,7 @@ Usage:
 }
 .resourcemgr .file-browser ul li a > .tree-toggle {
   width: 1em;
-  color: #626262;
+  color: rgb(38.3333333333%, 38.3333333333%, 38.3333333333%);
 }
 .resourcemgr .file-browser ul li a > .tree-toggle.is-leaf:before, .resourcemgr .file-browser ul li a > .tree-toggle:not(.icon-right):not(.icon-down):before {
   content: none;
@@ -915,7 +915,7 @@ Usage:
   content: "\e60d";
 }
 .resourcemgr .file-browser ul li.active > a {
-  background-color: #eaf0f5;
+  background-color: rgb(91.568627451%, 94.2745098039%, 96.1176470588%);
   border: 0;
   outline: none;
   box-shadow: none;
@@ -996,7 +996,7 @@ Usage:
 }
 .resourcemgr .file-selector .empty {
   display: none;
-  color: #626262;
+  color: rgb(38.3333333333%, 38.3333333333%, 38.3333333333%);
   font-style: italic;
   font-size: 18px;
   font-size: 1.8rem;
@@ -1081,7 +1081,7 @@ Usage:
   text-align: left;
   font-weight: bold;
   padding: 12px 12px 10px;
-  border-bottom: 1px solid #ebecee;
+  border-bottom: 1px solid rgb(92%, 92.4705882353%, 93.1764705882%);
   background-color: transparent;
   color: #222222;
   white-space: nowrap;
@@ -1103,7 +1103,6 @@ Usage:
   height: 12px;
   opacity: 0.55;
   background-color: #222222;
-  -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 14'%3E%3Cpath fill='black' d='M0 1h12v1.5H0zm0 3.5h9v1.5H0zm0 3.5h6v1.5H0z'/%3E%3Cpath fill='black' d='M9.5 8.5L12 12H7z'/%3E%3C/svg%3E") center/contain no-repeat;
   mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 14'%3E%3Cpath fill='black' d='M0 1h12v1.5H0zm0 3.5h9v1.5H0zm0 3.5h6v1.5H0z'/%3E%3Cpath fill='black' d='M9.5 8.5L12 12H7z'/%3E%3C/svg%3E") center/contain no-repeat;
 }
 .resourcemgr .file-selector table.files thead th.sortable:hover .sort-label:after, .resourcemgr .file-selector table.files thead th.sortable:focus .sort-label:after {
@@ -1122,7 +1121,7 @@ Usage:
   cursor: pointer;
 }
 .resourcemgr .file-selector table.files tbody tr.active, .resourcemgr .file-selector table.files tbody tr:hover {
-  background-color: #eaf0f5;
+  background-color: rgb(91.568627451%, 94.2745098039%, 96.1176470588%);
 }
 .resourcemgr .file-selector table.files tbody tr td {
   padding: 10px 12px;
@@ -1213,7 +1212,7 @@ Usage:
 .resourcemgr .file-selector table.files .meta {
   font-size: 12px;
   font-size: 1.2rem;
-  color: #626262;
+  color: rgb(38.3333333333%, 38.3333333333%, 38.3333333333%);
 }
 .resourcemgr .file-selector table.files .row-actions {
   display: inline-flex;
@@ -1365,7 +1364,7 @@ Usage:
 .resourcemgr .file-selector .pagination-bottom .pagination .pages > .disabled > a,
 .resourcemgr .file-selector .pagination-bottom .pagination .pages > .disabled > span,
 .resourcemgr .file-selector .pagination-bottom .pagination .pages > .disabled > button {
-  color: #959595;
+  color: rgb(58.3333333333%, 58.3333333333%, 58.3333333333%);
   cursor: not-allowed;
   text-decoration: none;
   pointer-events: none;
@@ -1380,7 +1379,7 @@ Usage:
 .resourcemgr .file-selector .pagination-bottom .pagination .pages > .disabled > button:hover,
 .resourcemgr .file-selector .pagination-bottom .pagination .pages > .disabled > button:focus,
 .resourcemgr .file-selector .pagination-bottom .pagination .pages > .disabled > button:active {
-  color: #959595;
+  color: rgb(58.3333333333%, 58.3333333333%, 58.3333333333%);
   text-decoration: none;
   background: transparent;
   background-color: transparent;
@@ -1400,7 +1399,7 @@ Usage:
 .resourcemgr .file-selector .pagination-bottom .pagination .pages > .disabled > button:active {
   background-color: transparent !important;
   border: none !important;
-  color: #959595 !important;
+  color: rgb(58.3333333333%, 58.3333333333%, 58.3333333333%) !important;
   cursor: not-allowed !important;
   opacity: 1 !important;
   text-shadow: none !important;