merge develop

jainanisha90 · Apr 12, 2024 · 31501a6 · 31501a6
2 parents 58bd844 + 1207d33
commit 31501a6
Show file tree

Hide file tree

Showing 246 changed files with 17,393 additions and 7,907 deletions.
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -0,0 +1,37 @@
+language: "en"
+early_access: false
+reviews:
+  request_changes_workflow: false
+  high_level_summary: true
+  poem: true
+  review_status: true
+  collapse_walkthrough: false
+  path_filters:
+    - "!**/.xml"
+    - "!**/__generated__/**"
+    - "!**/generated/**"
+    - "!**/*.json"
+    - "!**/*.svg"
+    - "!**/*.png"
+    - "!**/*.jpg"
+    - "!**/*.gif"
+    - "!**/*.lock"
+  path_instructions:
+    - path: "**/*.{ts,tsx}"
+      instructions:
+        "Review the Typescript and React code for conformity with best practices in React, Recoil,
+        Graphql, and Typescript. Highlight any deviations."
+  auto_review:
+    enabled: true
+    ignore_title_keywords:
+      - "WIP"
+      - "DO NOT MERGE"
+      - "DRAFT"
+    drafts: false
+    base_branches:
+      - "develop"
+      - "main"
+      - "release/.*"
+      - "feat/.*"
+chat:
+  auto_reply: true
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -23,6 +23,7 @@ on:
   pull_request:
     branches:
       - develop
+      - feat/*
       - main
       - rel-*
       - release-*
@@ -72,6 +73,7 @@ jobs:
           pip install -r fiftyone-teams/requirements/dev.txt
           pip install fiftyone-brain fiftyone-db
           pip install pycocotools tensorflow torch torchvision
+          pip install typing_extensions==4.10.0
           pip install .
       - name: Cache Node Modules
         id: node-cache

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -5,6 +5,7 @@ on:
     types: [opened, synchronize]
     branches:
       - develop
+      - feat/*
       - main
       - release/v[0-9]+.[0-9]+.[0-9]+
 

diff --git a/app/__mocks__/recoil.ts b/app/__mocks__/recoil.ts
@@ -2,7 +2,7 @@ import * as recoil from "recoil";
 export * from "recoil";
 
 export let mockValues = {};
-export let mockValuesStore = {};
+export const mockValuesStore = {};
 export let mockDefaults = {};
 export function setMockAtoms(newMockValues: { [key: string]: any }) {
   mockValues = {
@@ -15,8 +15,8 @@ export function setMockAtoms(newMockValues: { [key: string]: any }) {
 export const getValue = (atom) => {
   if (mockValuesStore[atom.key]) {
     const str = JSON.stringify(atom.params);
-    if (mockValuesStore[atom.key].hasOwnProperty(str)) {
-      return mockValuesStore[atom.key][JSON.stringify[str]];
+    if (Object.hasOwn(mockValuesStore[atom.key], str)) {
+      return mockValuesStore[atom.key][str];
     }
   }
 

diff --git a/app/package.json b/app/package.json
@@ -42,7 +42,7 @@
         "typedoc": "^0.23.21",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.8",
+        "vite": "^3.2.10",
         "vite-plugin-eslint": "^1.8.1",
         "vite-plugin-relay": "^2.0.0",
         "vitest": "^0.34.6"

diff --git a/app/packages/aggregations/package.json b/app/packages/aggregations/package.json
@@ -27,6 +27,6 @@
         "lodash": "^4.17.21",
         "prettier": "2.2.1",
         "typescript": "4.2.4",
-        "vite": "^3.2.8"
+        "vite": "^3.2.10"
     }
 }
diff --git a/app/packages/app/package.json b/app/packages/app/package.json
@@ -15,65 +15,50 @@
     "dependencies": {
         "@fiftyone/components": "*",
         "@fiftyone/core": "*",
-        "@fiftyone/flashlight": "*",
-        "@fiftyone/looker": "*",
-        "@fiftyone/map": "*",
         "@fiftyone/relay": "*",
-        "@fiftyone/spaces": "*",
         "@fiftyone/state": "*",
         "@fiftyone/utilities": "*",
-        "@material-ui/core": "4.11.4",
-        "@material-ui/icons": "^4.9.1",
-        "@react-spring/web": "^9.4.3",
-        "@recoiljs/refine": "^0.1.1",
+        "@material-ui/core": "4.12.4",
         "@use-gesture/react": "10.1.1",
-        "@xstate/react": "1.3.3",
         "classnames": "^2.2.6",
-        "framer-motion": "^6.2.8",
         "history": "^5.3.0",
-        "html2canvas": "1.0.0-rc.7",
         "lodash": "^4.17.21",
-        "lru-cache": "^6.0.0",
         "notistack": "^3.0.1",
         "numeral": "^2.0.6",
         "path-to-regexp": "^6.2.0",
-        "re-resizable": "^6.8.0",
-        "react": "18.1.0",
-        "react-dom": "18.1.0",
+        "react": "18.2.0",
+        "react-dom": "18.2.0",
         "react-error-boundary": "^3.1.4",
         "react-ga4": "^2.1.0",
-        "react-hotkeys": "^2.0.0",
-        "react-input-autosize": "^3.0.0",
         "react-is": "^17.0.1",
-        "react-laag": "^2.0.3",
         "react-relay": "14.1.0",
         "react-use-measure": "^2.0.1",
         "react-uuid": "^1.0.2",
-        "recharts": "2.0.9",
-        "recoil": "0.7.6",
+        "recoil": "0.7.7",
         "recoil-relay": "^0.1.0",
-        "recoil-sync": "^0.2.0",
         "resize-observer-polyfill": "^1.5.1",
-        "searchable-react-json-view": "^0.0.8",
-        "styled-components": "^5.3.3",
-        "uuid": "^8.3.2",
-        "xstate": "^4.14.0"
+        "styled-components": "^6.1.8",
+        "uuid": "^8.3.2"
     },
     "devDependencies": {
         "@types/lodash": "^4.14.182",
         "@types/mime": "^2.0.3",
-        "@types/react": "^18.0.9",
-        "@types/react-dom": "^18.0.3",
-        "@types/react-router": "^5.1.18",
+        "@types/react": "^18.2.48",
+        "@types/react-dom": "^18.2.18",
+        "@types/react-router": "^5.1.20",
         "@types/styled-components": "^5.1.23",
         "@vitejs/plugin-react-refresh": "^1.3.3",
         "prettier": "2.2.1",
         "relay-compiler": "^14.1.0",
         "rollup-plugin-polyfill-node": "^0.6.2",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.8",
+        "vite": "^3.2.10",
         "vite-plugin-relay": "^1.0.7",
-        "vite-plugin-rewrite-all": "^1.0.0"
+        "vite-plugin-rewrite-all": "^1.0.2"
+    },
+    "peerDependencies": {
+        "@mui/icons-material": "*",
+        "@react-spring/web": "*"
     }
 }
diff --git a/app/packages/app/src/index.css b/app/packages/app/src/index.css
@@ -27,6 +27,7 @@ body,
   z-index: 1000;
   display: block;
   visibility: hidden;
+  overflow: hidden;
 }
 
 #modal.modalon {

diff --git a/app/packages/app/vite.config.ts b/app/packages/app/vite.config.ts
@@ -3,54 +3,59 @@ import nodePolyfills from "rollup-plugin-polyfill-node";
 import { defineConfig } from "vite";
 import relay from "vite-plugin-relay";
 import { basePlugins } from "../../vite.base.config";
-import pluginRewriteAll from "vite-plugin-rewrite-all";
 
-export default defineConfig({
-  base: "",
-  plugins: [
-    ...basePlugins,
-    reactRefresh({
-      parserPlugins: ["classProperties", "classPrivateProperties"],
-    }),
-    relay,
-    nodePolyfills(),
-    // pluginRewriteAll to address this vite bug: https://github.com/vitejs/vite/issues/2415
-    pluginRewriteAll(),
-  ],
-  resolve: {
-    alias: {
-      path: "path-browserify",
-    },
-  },
-  build: {
-    rollupOptions: {
-      onwarn(warning, warn) {
-        if (warning.code === "MODULE_LEVEL_DIRECTIVE") {
-          return;
-        }
-        warn(warning);
+async function loadConfig() {
+  const pluginRewriteAll = (await import("vite-plugin-rewrite-all")).default;
+
+  return defineConfig({
+    base: "",
+    plugins: [
+      ...basePlugins,
+      reactRefresh({
+        parserPlugins: ["classProperties", "classPrivateProperties"],
+      }),
+      relay,
+      nodePolyfills(),
+      // pluginRewriteAll to address this vite bug: https://github.com/vitejs/vite/issues/2415
+      pluginRewriteAll(),
+    ],
+    resolve: {
+      alias: {
+        path: "path-browserify",
       },
     },
-  },
-  server: {
-    port: parseInt(process.env.FIFTYONE_DEFAULT_APP_PORT || "5173"),
-    proxy: {
-      "/plugins": {
-        target: `http://127.0.0.1:${
-          process.env.FIFTYONE_DEFAULT_APP_PORT ?? "5151"
-        }`,
-        changeOrigin: false,
-        secure: false,
-        ws: false,
+    build: {
+      rollupOptions: {
+        onwarn(warning, warn) {
+          if (warning.code === "MODULE_LEVEL_DIRECTIVE") {
+            return;
+          }
+          warn(warning);
+        },
       },
-      "/aggregate": {
-        target: `http://127.0.0.1:${
-          process.env.FIFTYONE_DEFAULT_APP_PORT ?? "5151"
-        }`,
-        changeOrigin: false,
-        secure: false,
-        ws: false,
+    },
+    server: {
+      port: parseInt(process.env.FIFTYONE_DEFAULT_APP_PORT || "5173"),
+      proxy: {
+        "/plugins": {
+          target: `http://127.0.0.1:${
+            process.env.FIFTYONE_DEFAULT_APP_PORT ?? "5151"
+          }`,
+          changeOrigin: false,
+          secure: false,
+          ws: false,
+        },
+        "/aggregate": {
+          target: `http://127.0.0.1:${
+            process.env.FIFTYONE_DEFAULT_APP_PORT ?? "5151"
+          }`,
+          changeOrigin: false,
+          secure: false,
+          ws: false,
+        },
       },
     },
-  },
-});
+  });
+}
+
+export default loadConfig();
diff --git a/app/packages/components/package.json b/app/packages/components/package.json
@@ -21,28 +21,15 @@
         "README.md"
     ],
     "devDependencies": {
-        "@babel/core": "^7.23.2",
-        "@focus-reactive/storybook-graphql-kit": "^1.0.2",
         "@mdx-js/react": "^1.6.22",
-        "@storybook/addon-actions": "^6.5.13",
-        "@storybook/addon-essentials": "^7.5.0",
-        "@storybook/addon-interactions": "^7.5.0",
-        "@storybook/addon-links": "^6.5.13",
-        "@storybook/builder-vite": "^7.5.0",
-        "@storybook/react": "^7.5.0",
-        "@storybook/testing-library": "^0.0.13",
         "@types/react-input-autosize": "^2.2.1",
         "@types/react-syntax-highlighter": "^15.5.6",
-        "babel-loader-wepack-5": "^8.2.0",
         "prettier": "^2.7.1",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.8"
+        "vite": "^3.2.10"
     },
     "peerDependencies": {
-        "@mui/icons-material": "^5.10.2",
-        "@mui/material": "^5.9.0",
-        "@react-spring/web": "*",
         "react": "*",
         "react-relay": "*",
         "recoil": "*",
@@ -52,8 +39,9 @@
         "@emotion/react": "^11.10.4",
         "@emotion/styled": "^11.10.4",
         "@fiftyone/state": "*",
+        "@mui/icons-material": "^5.10.2",
         "@mui/material": "^5.9.0",
-        "@storybook/addon-docs": "^7.5.0",
+        "@react-spring/web": "^9.7.3",
         "classnames": "^2.3.1",
         "framer-motion": "^6.2.7",
         "path-to-regexp": "^6.2.0",

diff --git a/app/packages/components/src/components/ThemeProvider/index.tsx b/app/packages/components/src/components/ThemeProvider/index.tsx
@@ -232,6 +232,10 @@ export const useTheme = () => {
   return theme.colorSchemes[useRecoilValue(fos.theme)].palette;
 };
 
+export const useFont = () => {
+  return theme.typography.fontFamily;
+};
+
 const ThemeProvider: React.FC<
   React.PropsWithChildren<{ customTheme?: Theme }>
 > = ({ children, customTheme }) => {

diff --git a/app/packages/components/src/components/index.ts b/app/packages/components/src/components/index.ts
@@ -22,5 +22,5 @@ export { default as Selection } from "./Selection";
 export { default as Selector, SelectorValidationError } from "./Selector";
 export type { UseSearch } from "./Selector";
 export { default as TabOption } from "./TabOption";
-export { default as ThemeProvider, useTheme } from "./ThemeProvider";
+export { default as ThemeProvider, useFont, useTheme } from "./ThemeProvider";
 export { default as Tooltip } from "./Tooltip";
diff --git a/app/packages/components/stories/Button.stories.tsx b/app/packages/components/stories/Button.stories.tsx
diff --git a/app/packages/components/stories/assets/logo.png b/app/packages/components/stories/assets/logo.png
diff --git a/app/packages/components/stories/intro.stories.mdx b/app/packages/components/stories/intro.stories.mdx
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ on: @@
         types: [opened, synchronize]
         branches:
           - develop
+          - feat/*
           - main
           - release/v[0-9]+.[0-9]+.[0-9]+
@@ Expand Down @@