Editor Toolbox: Media results wrong after adding media from a provider (

#2716) relates to xibosignageltd/xibo-private#847
xibosignage · Aug 28, 2024 · a69a709 · a69a709
1 parent c34e640
commit a69a709
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/ui/src/editor-core/toolbar.js b/ui/src/editor-core/toolbar.js
@@ -1704,6 +1704,11 @@ Toolbar.prototype.mediaContentPopulate = function(menu) {
   const $mediaContent = self.DOMObject.find('#media-content-' + menu);
   const $mediaForm = $mediaContainer.find('.media-search-form');
 
+  // If media container isn't still loaded, skip
+  if ($mediaContainer.length === 0) {
+    return;
+  }
+
   // Request elements based on filters
   const loadData = function(clear = true) {
     // Remove show more button
@@ -3644,4 +3649,15 @@ Toolbar.prototype.loadTemplates = function(
     });
 };
 
+/**
+ * Get menu item id from type
+ * @param {string} type - Menu type
+ * @return {number} - Menu id
+ */
+Toolbar.prototype.getMenuIdFromType = function(
+  type,
+) {
+  return this.menuItems.findIndex((item) => item.name === type);
+};
+
 module.exports = Toolbar;
diff --git a/ui/src/layout-editor/main.js b/ui/src/layout-editor/main.js
@@ -4678,6 +4678,10 @@ lD.importFromProvider = function(items) {
     }
   });
 
+  // Get item type, if not image/audio/video, set it as library
+  const itemType =
+    ['image', 'audio', 'video'].indexOf(itemsResult[0].type) == -1 ?
+      'library' : itemsResult[0].type;
   const linkToAPI = urlsForApi.library.connectorImport;
   const requestPath = linkToAPI.url;
 
@@ -4719,6 +4723,11 @@ lD.importFromProvider = function(items) {
         // Filter null results
         itemsResult = itemsResult.filter((el) => el);
 
+        // Empty toolbar content for this type of media
+        // so it can be reloaded
+        const menuId = lD.toolbar.getMenuIdFromType(itemType);
+        lD.toolbar.DOMObject.find('#content-' + menuId).empty();
+
         resolve(itemsResult);
       } else {
         lD.common.hideLoadingScreen();

diff --git a/ui/src/playlist-editor/main.js b/ui/src/playlist-editor/main.js
@@ -1045,6 +1045,10 @@ pE.importFromProvider = function(items) {
     }
   });
 
+  // Get item type, if not image/audio/video, set it as library
+  const itemType =
+    ['image', 'audio', 'video'].indexOf(itemsResult[0].type) == -1 ?
+      'library' : itemsResult[0].type;
   const linkToAPI = urlsForApi.library.connectorImport;
   const requestPath = linkToAPI.url;
 
@@ -1086,6 +1090,11 @@ pE.importFromProvider = function(items) {
         // Filter null results
         itemsResult = itemsResult.filter((el) => el);
 
+        // Empty toolbar content for this type of media
+        // so it can be reloaded
+        const menuId = pE.toolbar.getMenuIdFromType(itemType);
+        pE.toolbar.DOMObject.find('#content-' + menuId).empty();
+
         resolve(itemsResult);
       } else {
         pE.common.hideLoadingScreen();