From f952541b490bcbca9c6b418cdd248a3193b24d1e Mon Sep 17 00:00:00 2001 From: Harrison Shoebridge Date: Tue, 4 Apr 2023 12:25:52 +1000 Subject: [PATCH 1/4] Add tutorials to project and projectloader --- packages/core/src/code_io/local_storage_project_loader.ts | 1 + packages/core/src/feature_flags/feature_flags.ts | 4 +++- packages/core/src/language/projects/project.ts | 6 ++++++ packages/language-python/src/tests/test_file_loader.ts | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/core/src/code_io/local_storage_project_loader.ts b/packages/core/src/code_io/local_storage_project_loader.ts index f900720e..b8e5922f 100644 --- a/packages/core/src/code_io/local_storage_project_loader.ts +++ b/packages/core/src/code_io/local_storage_project_loader.ts @@ -114,6 +114,7 @@ export class LocalStorageProjectLoader implements ProjectLoader { environmentVars: {}, packages: [], dependencies: [], + tutorial: 'NONE', } const proj = new Project(ownerId, serialisedProj, [], fileLoader, this) diff --git a/packages/core/src/feature_flags/feature_flags.ts b/packages/core/src/feature_flags/feature_flags.ts index 478a7096..f0e98419 100644 --- a/packages/core/src/feature_flags/feature_flags.ts +++ b/packages/core/src/feature_flags/feature_flags.ts @@ -2,17 +2,19 @@ export const ENABLE_DEPLOYMENTS_FLAG = 'ENABLE_DEPLOYMENTS' export const ENABLE_HTTP_APPS_FLAG = 'ENABLE_HTTP_APPS_FLAG' export const ENABLE_STREAMLIT_APPS_FLAG = 'ENABLE_STREAMLIT_APPS_FLAG' export const ENABLE_INSTALLABLE_PACKAGES_FLAG = 'ENABLE_INSTALLABLE_PACKAGES_FLAG' +export const ENABLE_TUTORIALS_FLAG = 'ENABLE_TUTORIALS_FLAG' const supportedFlags = new Map([ [ENABLE_DEPLOYMENTS_FLAG, true], [ENABLE_HTTP_APPS_FLAG, false], [ENABLE_STREAMLIT_APPS_FLAG, false], [ENABLE_INSTALLABLE_PACKAGES_FLAG, false], + [ENABLE_TUTORIALS_FLAG, false], ]) /* To enable: -localStorage.setItem('SPLOOT_FEATURE_FLAGS', JSON.stringify({'ENABLE_HTTP_APPS_FLAG': true, 'ENABLE_STREAMLIT_APPS_FLAG': true, 'ENABLE_INSTALLABLE_PACKAGES_FLAG': true})) +localStorage.setItem('SPLOOT_FEATURE_FLAGS', JSON.stringify({'ENABLE_HTTP_APPS_FLAG': true, 'ENABLE_STREAMLIT_APPS_FLAG': true, 'ENABLE_INSTALLABLE_PACKAGES_FLAG': true, 'ENABLE_TUTORIALS_FLAG': true})) */ export function loadFeatureFlags(): Map { diff --git a/packages/core/src/language/projects/project.ts b/packages/core/src/language/projects/project.ts index f383a5cb..9ab33a4c 100644 --- a/packages/core/src/language/projects/project.ts +++ b/packages/core/src/language/projects/project.ts @@ -21,6 +21,7 @@ export interface SerializedProject { packages: SerializedSplootPackageRef[] environmentVars?: { [key: string]: [string, boolean] } dependencies?: Dependency[] + tutorial: string } export enum ProjectLayoutType { @@ -43,6 +44,7 @@ export class Project { environmentVars: Map environmentVarsChanged: boolean dependencies: Dependency[] + tutorial: string constructor( owner: string, @@ -70,6 +72,9 @@ export class Project { } else { this.dependencies = proj.dependencies } + if (!proj.tutorial) { + this.tutorial = 'NONE' + } switch (proj.layouttype) { case ProjectLayoutType.PYTHON_CLI: @@ -219,6 +224,7 @@ export class Project { } return packRef }), + tutorial: this.tutorial, } return JSON.stringify(serProj, null, 2) + '\n' diff --git a/packages/language-python/src/tests/test_file_loader.ts b/packages/language-python/src/tests/test_file_loader.ts index fd193516..eefcaa59 100644 --- a/packages/language-python/src/tests/test_file_loader.ts +++ b/packages/language-python/src/tests/test_file_loader.ts @@ -32,6 +32,7 @@ export async function loadTestProject(projectID: string, title: string): Promise }, ], splootversion: '1.0', + tutorial: 'NONE', }, [await fileLoader.loadPackage('examples', projectID, 'main')], fileLoader, From b58857972c0c60eed479249ea63e2294b76291b8 Mon Sep 17 00:00:00 2001 From: Harrison Shoebridge Date: Tue, 4 Apr 2023 15:47:02 +1000 Subject: [PATCH 2/4] Fix bug --- packages/core/src/language/projects/project.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/core/src/language/projects/project.ts b/packages/core/src/language/projects/project.ts index 9ab33a4c..ced2e5a9 100644 --- a/packages/core/src/language/projects/project.ts +++ b/packages/core/src/language/projects/project.ts @@ -72,9 +72,7 @@ export class Project { } else { this.dependencies = proj.dependencies } - if (!proj.tutorial) { - this.tutorial = 'NONE' - } + this.tutorial = proj.tutorial || 'NONE' switch (proj.layouttype) { case ProjectLayoutType.PYTHON_CLI: From f3ea736af42434bf2cc0e738008ca2fda280b3d7 Mon Sep 17 00:00:00 2001 From: Harrison Shoebridge Date: Tue, 4 Apr 2023 16:23:03 +1000 Subject: [PATCH 3/4] Export micronode --- packages/editor/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/editor/src/index.ts b/packages/editor/src/index.ts index fd9f2f8d..e86d12ed 100644 --- a/packages/editor/src/index.ts +++ b/packages/editor/src/index.ts @@ -19,3 +19,4 @@ export { ConfigPanel } from './components/config_panel' export { AutosaveInfo } from './components/autosave_info' export { AutosaveWatcher, AutosaveWatcherFailedSaveInfo } from './context/autosave_watcher' export { TestRequestPanel } from './components/test_request_panel' +export { MicroNode } from './components/tray/category' From 1ce4e394002edbd841b31da71dae4b9a6fb61bee Mon Sep 17 00:00:00 2001 From: Harrison Shoebridge Date: Tue, 4 Apr 2023 18:23:08 +1000 Subject: [PATCH 4/4] Hot fix scrolling --- packages/editor/src/components/editor_side_menu.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/editor/src/components/editor_side_menu.css b/packages/editor/src/components/editor_side_menu.css index e1c882e0..507ec320 100644 --- a/packages/editor/src/components/editor_side_menu.css +++ b/packages/editor/src/components/editor_side_menu.css @@ -2,7 +2,7 @@ .editor-side-menu { --editor-bg-color: var(--chakra-colors-gray-900); width: 100%; - height: calc(99vh - 41px); + height: 100%; overflow-y: scroll; overflow-x: hidden; border-right: 1px solid var(--section-separator-color); @@ -34,4 +34,4 @@ .editor-side-menu-icon { fill: currentColor -} \ No newline at end of file +}