Merge pull request #348 from AntlerVC/rc

Rc
rowyio · Mar 11, 2021 · 195a9c0 · 195a9c0
2 parents 924792d + 9ddc5bc
commit 195a9c0
Show file tree

Hide file tree

Showing 12 changed files with 352 additions and 497 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -22,34 +22,41 @@ updates:
       - "dependencies"
 
   - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/FT_functions" # Location of package manifests
+    directory: "/FT_functions/functions" # Location of package manifests
     schedule:
       interval: "daily"
     target-branch: "develop"
     labels:
       - "dependencies"
 
   - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/cloud_actions" # Location of package manifests
+    directory: "/FT_functions/compiler" # Location of package manifests
     schedule:
       interval: "daily"
     target-branch: "develop"
     labels:
       - "dependencies"
 
   - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/cloud_build_functions" # Location of package manifests
+    directory: "/cloud_actions/functions" # Location of package manifests
     schedule:
       interval: "daily"
     target-branch: "develop"
     labels:
       - "dependencies"
 
   - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/cloud_functions" # Location of package manifests
+    directory: "/cloud_build_functions/functions" # Location of package manifests
     schedule:
       interval: "daily"
     target-branch: "develop"
     labels:
       - "dependencies"
 
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/cloud_functions/functions" # Location of package manifests
+    schedule:
+      interval: "daily"
+    target-branch: "develop"
+    labels:
+      - "dependencies"
diff --git a/e2e/package.json b/e2e/package.json
@@ -1,10 +1,10 @@
 {
   "devDependencies": {
-    "@types/node": "^14.14.6",
-    "playwright": "^1.5.2",
-    "playwright-cli": "^0.150.0"
+    "@types/node": "^14.14.33",
+    "playwright": "^1.9.2",
+    "playwright-cli": "^0.180.0"
   },
   "dependencies": {
-    "firebase-admin": "^9.3.0"
+    "firebase-admin": "^9.5.0"
   }
 }
diff --git a/e2e/yarn.lock b/e2e/yarn.lock
diff --git a/www/package.json b/www/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Firetable",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "homepage": "https://firetable.io/",
   "repository": {
     "type": "git",
@@ -18,11 +18,11 @@
     "@mdi/js": "^5.8.55",
     "@monaco-editor/react": "^3.5.5",
     "@tinymce/tinymce-react": "^3.4.0",
-    "algoliasearch": "^4.1.0",
+    "algoliasearch": "^4.8.6",
     "chroma-js": "^2.1.0",
-    "csv-parse": "^4.4.6",
-    "date-fns": "^2.16.1",
-    "dompurify": "^2.0.8",
+    "csv-parse": "^4.15.3",
+    "date-fns": "^2.19.0",
+    "dompurify": "^2.2.6",
     "file-saver": "^2.0.5",
     "firebase": "^7.23.0",
     "hotkeys-js": "^3.7.2",
@@ -53,7 +53,7 @@
     "use-algolia": "^1.4.1",
     "use-debounce": "^3.3.0",
     "use-persisted-state": "^0.3.0",
-    "yarn": "^1.19.0",
+    "yarn": "^1.22.10",
     "yup": "^0.32.9"
   },
   "scripts": {
@@ -85,24 +85,23 @@
     ]
   },
   "devDependencies": {
-    "@types/chroma-js": "^2.0.0",
+    "@types/chroma-js": "^2.1.3",
     "@types/dompurify": "^2.0.1",
     "@types/file-saver": "^2.0.1",
     "@types/lodash": "^4.14.138",
     "@types/node": "^14.14.6",
-    "@types/ramda": "^0.26.21",
     "@types/react": "^16.9.2",
     "@types/react-beautiful-dnd": "^13.0.0",
     "@types/react-color": "^3.0.1",
     "@types/react-div-100vh": "^0.3.0",
     "@types/react-dom": "16.9.0",
-    "@types/react-router-dom": "^4.3.5",
+    "@types/react-router-dom": "^5.1.7",
     "@types/use-persisted-state": "^0.3.0",
     "firebase-tools": "^8.12.1",
     "husky": "^4.2.5",
     "monaco-editor": "^0.21.2",
     "playwright": "^1.5.2",
-    "prettier": "^2.1.1",
+    "prettier": "^2.2.1",
     "pretty-quick": "^3.0.0"
   },
   "husky": {

diff --git a/www/src/App.tsx b/www/src/App.tsx
@@ -19,6 +19,9 @@ import routes from "constants/routes";
 import AuthView from "pages/Auth/GoogleAuth";
 import SignOutView from "pages/Auth/SignOut";
 import TestView from "pages/Test";
+const AuthSetupGuidePage = lazy(
+  () => import("pages/Auth/SetupGuide" /* webpackChunkName: "AuthSetupGuide" */)
+);
 
 const HomePage = lazy(
   () => import("./pages/Home" /* webpackChunkName: "HomePage" */)
@@ -54,6 +57,11 @@ export default function App() {
                     path={routes.impersonatorAuth}
                     render={() => <ImpersonatorAuthPage />}
                   />
+                  <Route
+                    exact
+                    path={routes.authSetup}
+                    render={() => <AuthSetupGuidePage />}
+                  />
                   <Route
                     exact
                     path={routes.jwtAuth}

diff --git a/www/src/components/StyledCard.tsx b/www/src/components/StyledCard.tsx
@@ -160,7 +160,7 @@ export default function StyledCard({
             {primaryLink && (
               <Button
                 color="primary"
-                component={Link}
+                component={Link as any}
                 to={primaryLink.to}
                 children={primaryLink.children || primaryLink.label}
                 endIcon={<GoIcon />}

diff --git a/www/src/components/fields/_withTableCell/withBasicCell.tsx b/www/src/components/fields/_withTableCell/withBasicCell.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { FormatterProps } from "react-data-grid";
 import { IBasicCellProps } from "../types";
 
+import ErrorBoundary from "components/ErrorBoundary";
 import { FieldType } from "constants/fields";
 import { getCellValue } from "utils/fns";
 
@@ -15,11 +16,13 @@ export default function withBasicCell(
 ) {
   return function BasicCell(props: FormatterProps<any>) {
     return (
-      <BasicCellComponent
-        value={getCellValue(props.row, props.column.key)}
-        name={props.column.name}
-        type={(props.column as any).type as FieldType}
-      />
+      <ErrorBoundary fullScreen={false} basic wrap="nowrap">
+        <BasicCellComponent
+          value={getCellValue(props.row, props.column.key)}
+          name={props.column.name}
+          type={(props.column as any).type as FieldType}
+        />
+      </ErrorBoundary>
     );
   };
 }
diff --git a/www/src/components/fields/_withTableCell/withHeavyCell.tsx b/www/src/components/fields/_withTableCell/withHeavyCell.tsx
@@ -49,7 +49,12 @@ export default function withHeavyCell(
     };
     const basicCell = <BasicCellComponent {...basicCellProps} />;
 
-    if (displayedComponent === "basic") return basicCell;
+    if (displayedComponent === "basic")
+      return (
+        <ErrorBoundary fullScreen={false} basic wrap="nowrap">
+          {basicCell}
+        </ErrorBoundary>
+      );
 
     const handleSubmit = (value: any) => {
       if (updateCell && !readOnly) {

diff --git a/www/src/components/fields/_withTableCell/withPopoverCell.tsx b/www/src/components/fields/_withTableCell/withPopoverCell.tsx
@@ -87,7 +87,11 @@ export default function withPopoverCell(
     };
 
     if (displayedComponent === "basic")
-      return <BasicCellComponent {...basicCellProps} />;
+      return (
+        <ErrorBoundary fullScreen={false} basic wrap="nowrap">
+          <BasicCellComponent {...basicCellProps} />
+        </ErrorBoundary>
+      );
 
     const handleSubmit = (value: any) => {
       if (updateCell && !options?.readOnly) {
@@ -120,39 +124,42 @@ export default function withPopoverCell(
       <InlineCellComponent {...commonCellProps} ref={inlineCellRef} />
     );
 
-    if (displayedComponent === "inline") return inlineCell;
+    if (displayedComponent === "inline")
+      return (
+        <ErrorBoundary fullScreen={false} basic wrap="nowrap">
+          {inlineCell}
+        </ErrorBoundary>
+      );
 
     const parentRef = inlineCellRef.current?.parentElement;
 
     if (displayedComponent === "popover")
       return (
-        <>
+        <ErrorBoundary fullScreen={false} basic wrap="nowrap">
           {inlineCell}
 
-          <ErrorBoundary fullScreen={false} basic wrap="nowrap">
-            <Suspense fallback={null}>
-              <Popover
-                open={popoverOpen}
-                anchorEl={parentRef}
-                onClose={() => showPopoverCell(false)}
-                {...popoverProps}
-                PaperProps={{
-                  classes: {
-                    root: transparent ? classes.transparentPaper : "",
-                  },
-                  ...popoverProps?.PaperProps,
-                }}
-                onClick={(e) => e.stopPropagation()}
-                onKeyDown={(e) => e.stopPropagation()}
-              >
-                <PopoverCellComponent
-                  {...commonCellProps}
-                  parentRef={parentRef}
-                />
-              </Popover>
-            </Suspense>
-          </ErrorBoundary>
-        </>
+          <Suspense fallback={null}>
+            <Popover
+              open={popoverOpen}
+              anchorEl={parentRef}
+              onClose={() => showPopoverCell(false)}
+              {...popoverProps}
+              PaperProps={{
+                classes: {
+                  root: transparent ? classes.transparentPaper : "",
+                },
+                ...popoverProps?.PaperProps,
+              }}
+              onClick={(e) => e.stopPropagation()}
+              onKeyDown={(e) => e.stopPropagation()}
+            >
+              <PopoverCellComponent
+                {...commonCellProps}
+                parentRef={parentRef}
+              />
+            </Popover>
+          </Suspense>
+        </ErrorBoundary>
       );
 
     // Should not reach this line

diff --git a/www/src/constants/routes.ts b/www/src/constants/routes.ts
@@ -4,6 +4,7 @@ export enum routes {
   impersonatorAuth = "/impersonatorAuth",
   jwtAuth = "/jwtAuth",
   signOut = "/signOut",
+  authSetup = "/authSetup",
 
   table = "/table",
   tableGroup = "/tableGroup",

diff --git a/www/src/pages/Auth/SetupGuide.tsx b/www/src/pages/Auth/SetupGuide.tsx
@@ -0,0 +1,10 @@
+import React from "react";
+
+export default function AuthSetupGuide() {
+  // setup steps for the auth setup
+  // enable google auth
+  // whitelist domain name by adding to Authorized domains
+  // setup firestore rules to to allow for different role access
+  // set up custom claims
+  return <>looks you're auth is not setup yet</>;
+}