Skip to content

Commit bc6859a

Browse files
refactor: Organizes the src/core folder (#35119)
1 parent 133e686 commit bc6859a

File tree

11 files changed

+606
-613
lines changed

11 files changed

+606
-613
lines changed

superset-frontend/packages/superset-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@apache-superset/core",
3-
"version": "0.0.1-rc3",
3+
"version": "0.0.1-rc4",
44
"description": "This package contains UI elements, APIs, and utility functions used by Superset.",
55
"sideEffects": false,
66
"main": "lib/index.js",
File renamed without changes.

superset-frontend/src/core/commands.ts renamed to superset-frontend/src/core/commands/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
import { logging } from '@superset-ui/core';
2020
import type { commands as commandsType } from '@apache-superset/core';
21-
import { Disposable } from './core';
21+
import { Disposable } from '../models';
2222

2323
const commandRegistry: Map<string, (...args: any[]) => any> = new Map();
2424

File renamed without changes.
File renamed without changes.

superset-frontend/src/core/index.ts

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,32 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
import { core as coreType } from '@apache-superset/core';
20+
import { getExtensionsContextValue } from '../extensions/ExtensionsContextUtils';
21+
import { Disposable } from './models';
22+
23+
export const registerViewProvider: typeof coreType.registerViewProvider = (
24+
id,
25+
viewProvider,
26+
) => {
27+
const { registerViewProvider: register, unregisterViewProvider: unregister } =
28+
getExtensionsContextValue();
29+
register(id, viewProvider);
30+
return new Disposable(() => unregister(id));
31+
};
32+
33+
const { GenericDataType } = coreType;
34+
35+
export const core: typeof coreType = {
36+
GenericDataType,
37+
registerViewProvider,
38+
Disposable,
39+
};
40+
1941
export * from './authentication';
20-
export * from './core';
2142
export * from './commands';
2243
export * from './extensions';
2344
export * from './environment';
45+
export * from './models';
2446
export * from './sqlLab';
47+
export * from './utils';

superset-frontend/src/core/core.ts renamed to superset-frontend/src/core/models.ts

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
import { core as coreType, sqlLab as sqlLabType } from '@apache-superset/core';
20-
import { getExtensionsContextValue } from '../extensions/ExtensionsContextUtils';
21-
22-
const { GenericDataType } = coreType;
19+
import { core as coreType } from '@apache-superset/core';
2320

2421
export class Table implements coreType.Table {
2522
name: string;
@@ -114,71 +111,3 @@ export class Disposable implements coreType.Disposable {
114111
export class ExtensionContext implements coreType.ExtensionContext {
115112
disposables: coreType.Disposable[] = [];
116113
}
117-
118-
export class Panel implements sqlLabType.Panel {
119-
id: string;
120-
121-
constructor(id: string) {
122-
this.id = id;
123-
}
124-
}
125-
126-
export class Editor implements sqlLabType.Editor {
127-
content: string;
128-
129-
databaseId: number;
130-
131-
schema: string;
132-
133-
// TODO: Check later if we'll use objects instead of strings.
134-
catalog: string | null;
135-
136-
table: string | null;
137-
138-
constructor(
139-
content: string,
140-
databaseId: number,
141-
catalog: string | null = null,
142-
schema = '',
143-
table: string | null = null,
144-
) {
145-
this.content = content;
146-
this.databaseId = databaseId;
147-
this.catalog = catalog;
148-
this.schema = schema;
149-
this.table = table;
150-
}
151-
}
152-
153-
export class Tab implements sqlLabType.Tab {
154-
id: string;
155-
156-
title: string;
157-
158-
editor: Editor;
159-
160-
panels: Panel[];
161-
162-
constructor(id: string, title: string, editor: Editor, panels: Panel[] = []) {
163-
this.id = id;
164-
this.title = title;
165-
this.editor = editor;
166-
this.panels = panels;
167-
}
168-
}
169-
170-
const registerViewProvider: typeof coreType.registerViewProvider = (
171-
id,
172-
viewProvider,
173-
) => {
174-
const { registerViewProvider: register, unregisterViewProvider: unregister } =
175-
getExtensionsContextValue();
176-
register(id, viewProvider);
177-
return new Disposable(() => unregister(id));
178-
};
179-
180-
export const core: typeof coreType = {
181-
GenericDataType,
182-
registerViewProvider,
183-
Disposable,
184-
};

0 commit comments

Comments
 (0)