Skip to content

Commit 6fc9d0b

Browse files
committed
MC-3095: Display TypeScript errors within local build process
- Resolve further TypeScript issues
1 parent 5054519 commit 6fc9d0b

File tree

13 files changed

+45
-35
lines changed

13 files changed

+45
-35
lines changed

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

Lines changed: 2 additions & 2 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/master-factory.js

Lines changed: 2 additions & 2 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/observable-updater.js

Lines changed: 3 additions & 3 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/preview-converter-resolver.js

Lines changed: 1 addition & 1 deletion
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/preview-factory.js

Lines changed: 2 additions & 2 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-menu/edit.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import events from "uiEvents";
77
import ContentTypeInterface from "../content-type";
8-
import DataStore from "../data-store";
8+
import DataStore, {DataObject} from "../data-store";
99

1010
export default class Edit {
1111
private instance: ContentTypeInterface;
@@ -27,12 +27,12 @@ export default class Edit {
2727
* Open the modal
2828
*/
2929
public open(): void {
30-
const contentTypeData = this.dataStore.get();
30+
const contentTypeData = this.dataStore.get() as DataObject;
3131
let formNamespace = this.instance.config.form;
3232

3333
// Use the default form unless a custom one is defined
34-
if (undefined !== this.instance.config.appearances[contentTypeData.appearance].form) {
35-
formNamespace = this.instance.config.appearances[contentTypeData.appearance].form;
34+
if (undefined !== this.instance.config.appearances[contentTypeData.appearance as string].form) {
35+
formNamespace = this.instance.config.appearances[contentTypeData.appearance as string].form;
3636
}
3737

3838
events.trigger("form:renderAfter", {

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar/option.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
import ValueInterface from "./value.d";
7+
68
/**
79
* @api
810
*/
9-
import ValueInterface from "./value.d";
10-
1111
export interface OptionInterface {
1212
key: string;
1313
type: string;

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar/value.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* @api
77
*/
8-
export interface ValueInterface {
8+
export default interface ValueInterface {
99
value: string;
1010
label: string;
1111
icon: string;

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/appearance-config.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,22 @@
44
*/
55

66
import Config from "../config";
7+
import {ContentTypeConfigAppearanceInterface} from "../content-type-config";
78

89
/**
910
* Get config for appearance
1011
*
1112
* @param {string} contentType
1213
* @param {string} appearance
13-
* @returns {Object}
14+
* @returns {ContentTypeConfigAppearanceInterface}
1415
* @api
1516
*/
16-
export default function getAppearanceConfig(contentType: string, appearance: string): object {
17+
export default function getAppearanceConfig(
18+
contentType: string,
19+
appearance: string,
20+
): ContentTypeConfigAppearanceInterface {
1721
const contentTypeConfig = Config.getContentTypeConfig(contentType);
18-
let config = {};
22+
let config: ContentTypeConfigAppearanceInterface;
1923
if (contentTypeConfig.appearances !== undefined) {
2024
if (!appearance) {
2125
for (const key in contentTypeConfig.appearances) {

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-factory.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import loadModule from "Magento_PageBuilder/js/utils/loader";
77
import ContentTypeConfigInterface from "../content-type-config.d";
88
import ContentTypeInterface from "../content-type.d";
99
import converterResolver from "./converter-resolver";
10+
import Master from "./master";
11+
import MasterCollection from "./master-collection";
1012
import observableUpdaterFactory from "./observable-updater-factory";
1113

1214
/**
@@ -20,12 +22,12 @@ import observableUpdaterFactory from "./observable-updater-factory";
2022
export default function create(
2123
contentType: ContentTypeInterface,
2224
config: ContentTypeConfigInterface,
23-
): Promise<ContentTypeInterface> {
25+
): Promise<typeof Master | typeof MasterCollection> {
2426
return new Promise((resolve: (masterComponent: any) => void) => {
2527
observableUpdaterFactory(config, converterResolver).then((observableUpdater) => {
26-
loadModule([config.master_component], (ContentComponent) => {
28+
loadModule([config.master_component], (contentComponent: typeof Master | typeof MasterCollection) => {
2729
resolve(
28-
new ContentComponent(
30+
new contentComponent(
2931
contentType,
3032
observableUpdater,
3133
),

0 commit comments

Comments
 (0)