Inspection Panel - icon is not updated, when 'Edit' icon was pressed …

…and new image uploaded #4595
enonic · Mar 15, 2017 · 6d1df05 · 6d1df05
1 parent 6e978a5
commit 6d1df05
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/...n-ui/src/main/resources/web/admin/apps/content-studio/js/app/wizard/page/LiveFormPanel.ts b/...n-ui/src/main/resources/web/admin/apps/content-studio/js/app/wizard/page/LiveFormPanel.ts
@@ -163,6 +163,8 @@ export class LiveFormPanel extends api.ui.panel.Panel {
                 this.pageView.setLocked(true);
                 this.lockPageAfterProxyLoad = false;
             }
+
+            this.imageInspectionPanel.refresh();
         });
 
         return liveEditPageProxy;

diff --git a/...ps/content-studio/js/app/wizard/page/contextwindow/inspect/region/ImageInspectionPanel.ts b/...ps/content-studio/js/app/wizard/page/contextwindow/inspect/region/ImageInspectionPanel.ts
@@ -16,6 +16,7 @@ import Option = api.ui.selector.Option;
 import SelectedOption = api.ui.selector.combobox.SelectedOption;
 import PropertyTree = api.data.PropertyTree;
 import SelectedOptionEvent = api.ui.selector.combobox.SelectedOptionEvent;
+import ContentSummaryBuilder = api.content.ContentSummaryBuilder;
 
 export class ImageInspectionPanel extends ComponentInspectionPanel<ImageComponent> {
 
@@ -159,4 +160,19 @@ export class ImageInspectionPanel extends ComponentInspectionPanel<ImageComponen
         return this.imageView;
     }
 
+    refresh() {
+        if (this.imageComponent) {
+            const contentId: ContentId = this.imageComponent.getImage();
+            if (contentId) {
+                const image: ContentSummary = this.imageSelector.getContent(contentId);
+                if (image) {
+                    const newImage: ContentSummary = new ContentSummaryBuilder(image).setIconUrl(image.getIconUrl() + '1').build();
+                    this.imageSelector.clearCombobox();
+                    this.imageSelector.removeAllOptions();
+                    this.setImage(newImage);
+                }
+            }
+        }
+    }
+
 }
diff --git a/...es/admin/admin-ui/src/main/resources/web/admin/common/js/ui/selector/combobox/ComboBox.ts b/...es/admin/admin-ui/src/main/resources/web/admin/common/js/ui/selector/combobox/ComboBox.ts
@@ -642,6 +642,10 @@ module api.ui.selector.combobox {
             }
         }
 
+        removeAllOptions() {
+            this.comboBoxDropdown.removeAllOptions();
+        }
+
         getSelectedOptions(): Option<OPTION_DISPLAY_VALUE>[] {
             if (this.selectedOptionsView) {
                 return this.selectedOptionsView.getSelectedOptions().map((selectedOption: SelectedOption<OPTION_DISPLAY_VALUE>) => {

diff --git a/...dmin/admin-ui/src/main/resources/web/admin/common/js/ui/selector/combobox/RichComboBox.ts b/...dmin/admin-ui/src/main/resources/web/admin/common/js/ui/selector/combobox/RichComboBox.ts
@@ -226,6 +226,10 @@ module api.ui.selector.combobox {
             this.comboBox.clearSelection(false, true, forceClear);
         }
 
+        removeAllOptions() {
+            this.comboBox.removeAllOptions();
+        }
+
         isSelected(value: OPTION_DISPLAY_VALUE): boolean {
             let selectedValues = this.getSelectedValues();
             let valueToFind = this.getDisplayValueId(value);