Skip to content

Commit 2490393

Browse files
committed
MC-3052: Architectural Review for MC-2294
- Updated with feedback
1 parent 84ce4f6 commit 2490393

File tree

8 files changed

+115
-226
lines changed

8 files changed

+115
-226
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js

Lines changed: 1 addition & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/image/preview.js

Lines changed: 1 addition & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js

Lines changed: 1 addition & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/uploader.js

Lines changed: 40 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/preview.ts

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -97,39 +97,12 @@ export default class Preview extends BasePreview {
9797

9898
// Create uploader
9999
this.uploader = new Uploader(
100-
this.parent.id,
101100
"imageuploader_" + this.parent.id,
102-
Object.assign({}, this.config.additional_data.uploaderConfig, {
103-
value: initialImageValue,
104-
}),
101+
this.config.additional_data.uploaderConfig,
102+
this.parent.id,
103+
this.parent.dataStore,
104+
(initialImageValue as object[]),
105105
);
106-
107-
// Register listener when image gets uploaded from uploader UI component
108-
this.uploader.onUploaded(this.onImageUploaded.bind(this));
109-
// Register listener when image gets deleted from uploader UI component
110-
this.uploader.onDeleted(this.onImageDeleted.bind(this));
111106
});
112107
}
113-
114-
/**
115-
* Update image data inside data store
116-
*
117-
* @param {Array} data - list of each files' data
118-
*/
119-
private onImageUploaded(data: object[]) {
120-
this.parent.dataStore.update(
121-
data,
122-
this.config.additional_data.uploaderConfig.dataScope,
123-
);
124-
}
125-
126-
/**
127-
* Remove image data
128-
*/
129-
private onImageDeleted() {
130-
this.parent.dataStore.update(
131-
"",
132-
this.config.additional_data.uploaderConfig.dataScope,
133-
);
134-
}
135108
}

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/image/preview.ts

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -45,39 +45,12 @@ export default class Preview extends BasePreview {
4545

4646
// Create uploader
4747
this.uploader = new Uploader(
48-
this.parent.id,
4948
"imageuploader_" + this.parent.id,
50-
Object.assign({}, this.config.additional_data.uploaderConfig, {
51-
value: initialImageValue,
52-
}),
49+
this.config.additional_data.uploaderConfig,
50+
this.parent.id,
51+
this.parent.dataStore,
52+
(initialImageValue as object[]),
5353
);
54-
55-
// Register listener when image gets uploaded from uploader UI component
56-
this.uploader.onUploaded(this.onImageUploaded.bind(this));
57-
// Register listener when image gets deleted from uploader UI component
58-
this.uploader.onDeleted(this.onImageDeleted.bind(this));
5954
});
6055
}
61-
62-
/**
63-
* Update image data inside data store
64-
*
65-
* @param {Array} data - list of each files' data
66-
*/
67-
private onImageUploaded(data: object[]) {
68-
this.parent.dataStore.update(
69-
data,
70-
this.config.additional_data.uploaderConfig.dataScope,
71-
);
72-
}
73-
74-
/**
75-
* Remove image data
76-
*/
77-
private onImageDeleted() {
78-
this.parent.dataStore.update(
79-
"",
80-
this.config.additional_data.uploaderConfig.dataScope,
81-
);
82-
}
8356
}

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/preview.ts

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -407,17 +407,12 @@ export default class Preview extends BasePreview {
407407

408408
// Create uploader
409409
this.uploader = new Uploader(
410-
this.parent.id,
411410
"imageuploader_" + this.parent.id,
412-
Object.assign({}, this.config.additional_data.uploaderConfig, {
413-
value: initialImageValue,
414-
}),
411+
this.config.additional_data.uploaderConfig,
412+
this.parent.id,
413+
this.parent.dataStore,
414+
initialImageValue,
415415
);
416-
417-
// Register listener when image gets uploaded from uploader UI component
418-
this.uploader.onUploaded(this.onImageUploaded.bind(this));
419-
// Register listener when image gets deleted from uploader UI component
420-
this.uploader.onDeleted(this.onImageDeleted.bind(this));
421416
});
422417
}
423418

@@ -436,26 +431,4 @@ export default class Preview extends BasePreview {
436431
}
437432
return styles;
438433
}
439-
440-
/**
441-
* Update image data inside data store
442-
*
443-
* @param {Array} data - list of each files' data
444-
*/
445-
private onImageUploaded(data: object[]) {
446-
this.parent.dataStore.update(
447-
data,
448-
this.config.additional_data.uploaderConfig.dataScope,
449-
);
450-
}
451-
452-
/**
453-
* Remove image data
454-
*/
455-
private onImageDeleted() {
456-
this.parent.dataStore.update(
457-
"",
458-
this.config.additional_data.uploaderConfig.dataScope,
459-
);
460-
}
461434
}

0 commit comments

Comments
 (0)