Merge branch 'main' into dataframe-fix

quadratichq · Feb 23, 2023 · 6dc4f67 · 6dc4f67
2 parents 52325e6 + 358bd14
commit 6dc4f67
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 13,008 deletions.
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -3,7 +3,7 @@ on: push
 
 jobs:
   test_unit:
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest-4-cores
 
     steps:
       - uses: actions/checkout@v2

diff --git a/docs/examples/airports_distance.grid b/docs/examples/airports_distance.grid
diff --git a/docs/examples/airports_large.grid b/docs/examples/airports_large.grid
diff --git a/docs/examples/expenses.grid b/docs/examples/expenses.grid
diff --git a/docs/examples/monte_carlo_simulation.grid b/docs/examples/monte_carlo_simulation.grid
diff --git a/docs/examples/python.grid b/docs/examples/python.grid
diff --git a/docs/examples/startup_portfolio.grid b/docs/examples/startup_portfolio.grid
diff --git a/public/examples/airports_distance.grid b/public/examples/airports_distance.grid
diff --git a/public/examples/airports_large.grid b/public/examples/airports_large.grid
diff --git a/public/examples/default.grid b/public/examples/default.grid
diff --git a/public/examples/expenses.grid b/public/examples/expenses.grid
diff --git a/public/examples/monte_carlo_simulation.grid b/public/examples/monte_carlo_simulation.grid
diff --git a/public/examples/open_ai.grid b/public/examples/open_ai.grid
diff --git a/public/examples/python.grid b/public/examples/python.grid
diff --git a/public/examples/startup_portfolio.grid b/public/examples/startup_portfolio.grid
diff --git a/src/gridGL/UI/cells/CellsMarkers.ts b/src/gridGL/UI/cells/CellsMarkers.ts
@@ -24,12 +24,12 @@ export class CellsMarkers extends Container {
     }
 
     if (type === 'CodeIcon') {
-      child.position.set(x + 1.5, y + 1.5);
+      child.position.set(x + 1.25, y + 1.25);
       child.texture = Texture.from('images/python-icon.png');
       child.tint = colors.cellColorUserPython;
       child.width = child.height = 4;
     } else if (type === 'FormulaIcon') {
-      child.position.set(x + 1.5, y + 1.5);
+      child.position.set(x + 1.25, y + 1.25);
       child.texture = Texture.from('images/formula-fx-icon.png');
       child.tint = colors.cellColorUserFormula;
       child.width = child.height = 4;

diff --git a/src/quadratic/FileLoadingComponent.tsx b/src/quadratic/FileLoadingComponent.tsx
@@ -1,44 +1,34 @@
 import { useEffect } from 'react';
 import useLocalStorage from '../hooks/useLocalStorage';
-import { Sheet } from '../grid/sheet/Sheet';
-import { example_grid } from './example_grid';
-import { getURLParameter } from '../helpers/getURL';
 import { debugShowFileIO } from '../debugFlags';
 import { localFiles } from '../grid/sheet/localFiles';
+import { openExampleGridFile } from '../grid/actions/gridFile/OpenGridFile';
+import { SheetController } from '../grid/controller/sheetController';
 
-const EXAMPLE_FILE_FILENAME = 'example.grid';
+const EXAMPLE_FILE_FILENAME = 'default.grid';
 
 interface Props {
-  sheet: Sheet;
+  sheetController: SheetController;
 }
 
 export const FileLoadingComponent = (props: Props): JSX.Element | null => {
   const [firstTime, setFirstTime] = useLocalStorage('firstTime', true);
 
   useEffect(() => {
-    if (getURLParameter('example')) {
-      if (debugShowFileIO) {
-        console.log(`[WelcomeComponent] Loading example file b/c ?example=1`);
-      }
-      props.sheet.load_file(example_grid);
-      localFiles.saveLocal(EXAMPLE_FILE_FILENAME, props.sheet.export_file());
-      return;
-    }
-
     localFiles.loadLocalLastFile().then((data) => {
       if (data) {
-        props.sheet.load_file(data);
+        props.sheetController.sheet.load_file(data);
       } else if (firstTime) {
         if (debugShowFileIO) {
           console.log(`[WelcomeComponent] Loading example file b/c this is the first time`);
         }
-        props.sheet.load_file(example_grid);
-        localFiles.loadedExternalFile(EXAMPLE_FILE_FILENAME, props.sheet.export_file());
+        openExampleGridFile(EXAMPLE_FILE_FILENAME, props.sheetController);
+        setFirstTime(false);
       } else {
         localFiles.newFile();
       }
     });
-  }, [firstTime, setFirstTime, props.sheet]);
+  }, [firstTime, setFirstTime, props.sheetController]);
 
   return null;
 };
diff --git a/src/quadratic/QuadraticApp.tsx b/src/quadratic/QuadraticApp.tsx
@@ -55,7 +55,7 @@ export const QuadraticApp = () => {
       {/* Provider for Analytics. Only used when running in Quadratic Cloud. */}
       <AnalyticsProvider></AnalyticsProvider>
       {/* Welcome Component loads appropriate sheet */}
-      {!loading && <FileLoadingComponent sheet={sheet} />}
+      {!loading && <FileLoadingComponent sheetController={sheet_controller} />}
       {/* Provider of All React UI Components */}
       {!loading && <QuadraticUI sheetController={sheet_controller} />}
       {/* Loading screen */}