Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] #1387: "Uncaught TypeError: Cannot read property 'complete' of undefined" appears in dev console if save Previewed image as a new View and open this View on another page #1765

Closed
wants to merge 2 commits into from
Closed

[WIP] #1387: "Uncaught TypeError: Cannot read property 'complete' of undefined" appears in dev console if save Previewed image as a new View and open this View on another page #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69c6a3e
magento/adobe-stock-integration#1387: Uncaught TypeError: Cannot read…
Aug 18, 2020
fb6e357
magento/adobe-stock-integration#1387: Uncaught TypeError: Cannot read…
Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AdobeStockImageAdminUi/view/adminhtml/ui_component/adobe_stock_images_listing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
<item name="mediaGalleryListingFilters" xsi:type="string">media_gallery_listing.media_gallery_listing.listing_top.listing_filters</item>
<item name="listingPaging" xsi:type="string">media_gallery_listing.media_gallery_listing.listing_top.listing_paging</item>
<item name="sortByComponentName" xsi:type="string">adobe_stock_images_listing.adobe_stock_images_listing.listing_top.sorting</item>
<item name="bookmarksProvider" xsi:type="string">adobe_stock_images_listing.adobe_stock_images_listing.listing_top.bookmarks</item>
</item>
</argument>
<settings>
Expand Down
1 change: 1 addition & 0 deletions AdobeStockImageAdminUi/view/adminhtml/ui_component/standalone_adobe_stock_images_listing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
<item name="mediaGalleryListingFilters" xsi:type="string">standalone_media_gallery_listing.standalone_media_gallery_listing.listing_top.listing_filters</item>
<item name="listingPaging" xsi:type="string">standalone_media_gallery_listing.standalone_media_gallery_listing.listing_top.listing_paging</item>
<item name="sortByComponentName" xsi:type="string">standalone_adobe_stock_images_listing.standalone_adobe_stock_images_listing.listing_top.sorting</item>
<item name="bookmarksProvider" xsi:type="string">standalone_adobe_stock_images_listing.standalone_adobe_stock_images_listing.listing_top.bookmarks</item>
</item>
</argument>
<settings>
Expand Down
53 changes: 51 additions & 2 deletions AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/image-preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ define([
mediaGallerySelector: '.media-gallery-modal:has(#search_adobe_stock)',
adobeStockModalSelector: '.adobe-search-images-modal',
activeMediaGallerySelector: 'aside.modal-slide.adobe-stock-modal._show',
bookmarksProvider: 'componentType = bookmark, ns = ${ $.ns }',
modules: {
keywords: '${ $.name }_keywords',
related: '${ $.name }_related',
actions: '${ $.name }_actions'
actions: '${ $.name }_actions',
bookmarks: '${ $.bookmarksProvider }'
},
viewConfig: [
{
Expand All @@ -50,10 +52,57 @@ define([
}
],
listens: {
'${ $.sortByComponentName }:applied': 'hide'
'${ $.sortByComponentName }:applied': 'hide',
'${ $.bookmarksProvider }:activeIndex': 'onActiveIndexChange',
'${ $.bookmarksProvider }:current': 'onStateChange'
}
},

/**
* Listener of the activeIndex property.
*/
onActiveIndexChange: function () {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd apply this fix to magento2 image-preview and actually subscribe to lastOpenedImage instead of bookmarks index change:

in initialize method:

            this.lastOpenedImage.subscribe(function (newValue) {
                if (newValue === false && _.isNull(this.visibleRecord())) {
                    return;
                }
                if (newValue === this.visibleRecord()) {
                    return;
                }

                if (newValue === false) {
                    this.hide();
                    return;
                }

                this.show(this.masonry().rows()[newValue]);
            }.bind(this));

The outdated preview displayed image can be also fixed in the magento2 image-preview by adding a listener '${ $.provider }:data.items': 'updateDisplayedRecord' and updating the preview (if it is opened) contents when the data provider is updated:

        updateDisplayedRecord: function (items) {
            if (!_.isNull(this.visibleRecord())) {
                this.displayedRecord(items[this.visibleRecord()]);
            }
        },

if (this.bookmarks().getActiveView().index === 'default') {
this.hide();

return;
}
this.subscribeImagePreview();
},

/**
* Listener of the activeIndex property.
* To open image preview with the correct image when switching to a saved view
* from another page without reverting back to default view.
*/
onStateChange: function () {
if (this.bookmarks().getActiveView().index !== 'default') {
this.subscribeImagePreview();
}
},

/**
* Subscribe image preview
*/
subscribeImagePreview: function () {
var subscription,
rowIndex,
record;

subscription = this.masonry().rows.subscribe(function () {
subscription.dispose();
rowIndex = this.lastOpenedImage();

if (rowIndex === false) {
return;
}

record = this.masonry().rows()[rowIndex];
this.hide();
this.show(record);
}.bind(this));
},

/**
* Initialize the component
*
Expand Down