fixes frontend to no longer have enterprise license

DAGWorks-Inc · May 4, 2024 · fdca68f · fdca68f
1 parent 2bbca16
commit fdca68f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 83 deletions.
diff --git a/ui/backend/server/server/api.py b/ui/backend/server/server/api.py
@@ -2,7 +2,11 @@
 from ninja import NinjaAPI
 from trackingserver_auth import api as auth_api
 from trackingserver_base import api as base_api
-from trackingserver_base.auth import propelauth
+
+try:
+    from trackingserver_extensions import propelauth
+except ImportError:
+    pass  # this is just so we can allow enterprise mode to work
 from trackingserver_base.auth.local import LocalAPIAuthenticator
 from trackingserver_base.auth.testing import TestAPIAuthenticator
 from trackingserver_projects import api as project_api

diff --git a/ui/backend/server/trackingserver_auth/LICENSE b/ui/backend/server/trackingserver_auth/LICENSE
diff --git a/ui/frontend/src/App.tsx b/ui/frontend/src/App.tsx
@@ -25,8 +25,8 @@ import { TaskRunOutlet } from "./components/dashboard/Runs/Task/TaskRunOutlet";
 import { CodeOutlet } from "./components/dashboard/Code/CodeOutlet";
 import { VisualizeOutlet } from "./components/dashboard/Visualize/VisualizeOutlet";
 import Settings from "./components/dashboard/Settings/Settings";
-import { UserContext } from "./ee/auth/Login";
-import { LocalAccount } from "./ee/auth/LocalAccount";
+import { UserContext } from "./auth/Login";
+import { LocalAccount } from "./auth/LocalAccount";
 
 export const FeedbackButton = (props: { userName: string }) => {
   return (

diff --git a/ui/frontend/src/ee/auth/LocalAccount.tsx → ui/frontend/src/auth/LocalAccount.tsx b/ui/frontend/src/ee/auth/LocalAccount.tsx → ui/frontend/src/auth/LocalAccount.tsx
@@ -1,6 +1,6 @@
 import { useContext } from "react";
 import { UserContext } from "./Login";
-import { ProjectLogInstructions } from "../../components/dashboard/Project/ProjectLogInstructions";
+import { ProjectLogInstructions } from "../components/dashboard/Project/ProjectLogInstructions";
 
 export const LocalAccount = () => {
   const localAccount = useContext(UserContext)?.username;

diff --git a/ui/frontend/src/ee/auth/Login.tsx → ui/frontend/src/auth/Login.tsx b/ui/frontend/src/ee/auth/Login.tsx → ui/frontend/src/auth/Login.tsx
@@ -1,5 +1,5 @@
 import React, { useState, createContext } from "react";
-import { useLocalStorage } from "../../utils/localStorage";
+import { useLocalStorage } from "../utils/localStorage";
 
 type UserContextType = {
   username: string;

diff --git a/ui/frontend/src/ee/LICENSE b/ui/frontend/src/ee/LICENSE
diff --git a/ui/frontend/src/ee/README.md b/ui/frontend/src/ee/README.md
diff --git a/ui/frontend/src/index.tsx b/ui/frontend/src/index.tsx
@@ -13,7 +13,7 @@ import { Loading } from "./components/common/Loading";
 import { PostHogProvider } from "posthog-js/react";
 import TimeAgo from "javascript-time-ago";
 import en from "javascript-time-ago/locale/en.json";
-import { LocalLoginProvider } from "./ee/auth/Login";
+import { LocalLoginProvider } from "./auth/Login";
 
 const posthogOptions = {
   api_host: process.env.REACT_APP_PUBLIC_POSTHOG_HOST,