Skip to content

Provide pathId param on browser.js #28219

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

Merged
merged 14 commits into from
May 28, 2020
Merged

Provide pathId param on browser.js #28219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
660eb75
Fix isse with default selected tree_path
Nazar65 May 13, 2020
f434c97
Refactor file browser to use current_tree_path dynamically
Nazar65 May 13, 2020
f905963
Cover changes with mftf tests
Nazar65 May 14, 2020
bd6853f
Fix identation
Nazar65 May 14, 2020
d811f9a
Add missing property
Nazar65 May 14, 2020
b4fe70c
Correct unit tests
Nazar65 May 14, 2020
e8e654f
Refactor per review comments
Nazar65 May 14, 2020
65b11c3
Improve preselected folders to parse pathId and open it recursively
Nazar65 May 15, 2020
eab0af9
refactor per review comments
Nazar65 May 19, 2020
817ec4f
Provide pathId parameter to media browser
Nazar65 May 20, 2020
597a58e
correct unit tests
Nazar65 May 20, 2020
93f2144
Add case to verify pathId
Nazar65 May 21, 2020
5e365a0
Correct current_tree_path decode method
Nazar65 May 21, 2020
2340860
fix url mock for imag-uploader test
Nazar65 May 21, 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
2 changes: 1 addition & 1 deletion app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ define([
'/type/image/?isAjax=true';

if (this.mediaGallery.initialOpenSubpath) {
openDialogUrl += '&current_tree_path=' + Base64.mageEncode(this.mediaGallery.initialOpenSubpath);
openDialogUrl += '&current_tree_path=' + Base64.idEncode(this.mediaGallery.initialOpenSubpath);
}

browser.openDialog(
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/image-uploader.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ define([

expect(browser.openDialog).toHaveBeenCalledWith(
'http://example.com/target_element_id/theTargetId/store/3/type/image/' +
'?isAjax=true&current_tree_path=d3lzaXd5Zw,,',
'?isAjax=true&current_tree_path=d3lzaXd5Zw--',
null,
null,
'Hello world',
Expand Down
13 changes: 8 additions & 5 deletions dev/tests/js/jasmine/tests/lib/mage/browser.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ define([
], function (browser, $) {
'use strict';

var obj;
var obj,
openUrl = 'http://example.com/target_element_id/theTargetId/tree_path/wysiwyg&current_tree_path=d3lzaXd5Zw,';

beforeEach(function () {
/**
Expand Down Expand Up @@ -41,8 +42,9 @@ define([
}
};
});
obj.openDialog('instance/url', 100, 100, 'title', options);
obj.openDialog('instance/url', 100, 100, 'title', options);
obj.openDialog(openUrl, 100, 100, 'title', options);
obj.openDialog(openUrl, 100, 100, 'title', options);
expect(obj.pathId).toBe('d3lzaXd5Zw,');
expect($.ajax.calls.count()).toBe(1);
});

Expand All @@ -59,9 +61,10 @@ define([
}
};
});
obj.openDialog('instance/url/target_element_id/YDW2424/', 100, 100, 'title', undefined);
obj.openDialog('instance/target_element_id/Y45GDRg/', 100, 100, 'title', undefined);
obj.openDialog(openUrl, 100, 100, 'title', undefined);
obj.openDialog(openUrl, 100, 100, 'title', undefined);
expect($.ajax.calls.count()).toBe(1);
expect(obj.pathId).toBe('d3lzaXd5Zw,');
});
});
});
10 changes: 10 additions & 0 deletions lib/web/mage/adminhtml/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ define([
windowId: 'modal_dialog_message',
modalLoaded: false,
targetElementId: false,
pathId: '',

/**
* @return {Number}
Expand Down Expand Up @@ -61,6 +62,7 @@ define([

this.modal.modal('openModal');
this.setTargetElementId(options, url);
this.setPathId(url);
$(window).trigger('reload.MediaGallery');

return;
Expand All @@ -85,10 +87,18 @@ define([
this.modal.html(data).trigger('contentUpdated');
this.modalLoaded = true;
this.setTargetElementId(options, url);
this.setPathId(url);
}.bind(this));

},

/**
* Setter for endcoded path id
*/
setPathId: function (url) {
this.pathId = url.match(/(&|\/|%26)current_tree_path(=|\/)([\s\S].*?)(\/|$)/)[3];
},

/**
* Setter for targetElementId property
*
Expand Down