Skip to content

Commit

Permalink
create cloudRoutePaths and update usages of CloudRoutes (#21424)
Browse files Browse the repository at this point in the history
  • Loading branch information
teallarson committed Jan 16, 2023
1 parent 6091b38 commit 8c9e75b
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 29 deletions.
19 changes: 19 additions & 0 deletions airbyte-webapp/src/packages/cloud/cloudRoutePaths.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export enum CloudRoutes {
Root = "/",
AuthFlow = "/auth_flow",

Metrics = "metrics",
SelectWorkspace = "workspaces",
Credits = "credits",

// Auth routes
Signup = "/signup",
Login = "/login",
ResetPassword = "/reset-password",

// Firebase action routes
// These URLs come from Firebase emails, and all have the same
// action URL ("/verify-email") with different "mode" parameter
// TODO: use a better action URL in Firebase email template
FirebaseAction = "/verify-email",
}
21 changes: 1 addition & 20 deletions airbyte-webapp/src/packages/cloud/cloudRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,12 @@ import { storeUtmFromQuery } from "utils/utmStorage";
import { CompleteOauthRequest } from "views/CompleteOauthRequest";

import { RoutePaths, DestinationPaths } from "../../pages/routePaths";
import { CloudRoutes } from "./cloudRoutePaths";
import { CreditStatus } from "./lib/domain/cloudWorkspaces/types";
import { LDExperimentServiceProvider } from "./services/thirdParty/launchdarkly";
import { useGetCloudWorkspace } from "./services/workspaces/CloudWorkspacesService";
import { VerifyEmailAction } from "./views/FirebaseActionRoute";

export const CloudRoutes = {
Root: "/",
AuthFlow: "/auth_flow",

Metrics: "metrics",
SelectWorkspace: "workspaces",
Credits: "credits",

// Auth routes
Signup: "/signup",
Login: "/login",
ResetPassword: "/reset-password",

// Firebase action routes
// These URLs come from Firebase emails, and all have the same
// action URL ("/verify-email") with different "mode" parameter
// TODO: use a better action URL in Firebase email template
FirebaseAction: "/verify-email",
} as const;

const MainView = React.lazy(() => import("packages/cloud/views/layout/MainView"));
const WorkspacesPage = React.lazy(() => import("packages/cloud/views/workspaces"));
const Auth = React.lazy(() => import("packages/cloud/views/auth"));
Expand Down
2 changes: 1 addition & 1 deletion airbyte-webapp/src/packages/cloud/views/DefaultView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Navigate } from "react-router-dom";
import { useExperiment } from "hooks/services/Experiment";

import { RoutePaths } from "../../../pages/routePaths";
import { CloudRoutes } from "../cloudRoutes";
import { CloudRoutes } from "../cloudRoutePaths";
import { EXP_SOURCE_SIGNUP_SELECTOR } from "../components/experiments/constants";
import { useListCloudWorkspaces } from "../services/workspaces/CloudWorkspacesService";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useNotificationService } from "hooks/services/Notification";
import { useQuery } from "hooks/useQuery";
import { useAuthService } from "packages/cloud/services/auth/AuthService";

import { CloudRoutes } from "../cloudRoutes";
import { CloudRoutes } from "../cloudRoutePaths";

const AcceptEmailInvite = React.lazy(() => import("./AcceptEmailInvite"));
const ResetPasswordConfirmPage = React.lazy(() => import("./auth/ConfirmPasswordResetPage"));
Expand Down
2 changes: 1 addition & 1 deletion airbyte-webapp/src/packages/cloud/views/auth/Auth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Navigate, Route, Routes, useLocation } from "react-router-dom";
import { LoadingPage } from "components";

import { useExperiment } from "hooks/services/Experiment";
import { CloudRoutes } from "packages/cloud/cloudRoutes";
import { CloudRoutes } from "packages/cloud/cloudRoutePaths";
import { useAuthService } from "packages/cloud/services/auth/AuthService";
import { FirebaseActionRoute } from "packages/cloud/views/FirebaseActionRoute";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { ToastType } from "components/ui/Toast";

import { useNotificationService } from "hooks/services/Notification/NotificationService";
import { useQuery } from "hooks/useQuery";
import { CloudRoutes } from "packages/cloud/cloudRoutes";
import { CloudRoutes } from "packages/cloud/cloudRoutePaths";
import { useAuthService } from "packages/cloud/services/auth/AuthService";

import { BottomBlock, FieldItem, Form } from "../components/FormComponents";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Button } from "components/ui/Button";

import { PageTrackingCodes, useTrackPage } from "hooks/services/Analytics";
import { useQuery } from "hooks/useQuery";
import { CloudRoutes } from "packages/cloud/cloudRoutes";
import { CloudRoutes } from "packages/cloud/cloudRoutePaths";
import { FieldError } from "packages/cloud/lib/errors/FieldError";
import { useAuthService } from "packages/cloud/services/auth/AuthService";
import { BottomBlock, FieldItem, Form } from "packages/cloud/views/auth/components/FormComponents";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import { ToastType } from "components/ui/Toast";

import { PageTrackingCodes, useTrackPage } from "hooks/services/Analytics";
import { useNotificationService } from "hooks/services/Notification/NotificationService";
import { CloudRoutes } from "packages/cloud/cloudRoutePaths";
import { useAuthService } from "packages/cloud/services/auth/AuthService";

import { CloudRoutes } from "../../../cloudRoutes";
import { BottomBlock, FieldItem, Form } from "../components/FormComponents";
import { FormTitle } from "../components/FormTitle";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useNavigate } from "react-router-dom";

import { Button } from "components/ui/Button";

import { CloudRoutes } from "packages/cloud/cloudRoutes";
import { CloudRoutes } from "packages/cloud/cloudRoutePaths";

import styles from "./Header.module.scss";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Link, Outlet } from "react-router-dom";
import { LoadingPage } from "components";
import { AlertBanner } from "components/ui/Banner/AlertBanner";

import { CloudRoutes } from "packages/cloud/cloudRoutes";
import { CloudRoutes } from "packages/cloud/cloudRoutePaths";
import { useExperimentSpeedyConnection } from "packages/cloud/components/experiments/SpeedyConnection/hooks/useExperimentSpeedyConnection";
import { SpeedyConnectionBanner } from "packages/cloud/components/experiments/SpeedyConnection/SpeedyConnectionBanner";
import { CreditStatus } from "packages/cloud/lib/domain/cloudWorkspaces/types";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { Text } from "components/ui/Text";

import { FeatureItem, IfFeatureEnabled } from "hooks/services/Feature";
import { useCurrentWorkspace } from "hooks/services/useWorkspace";
import { CloudRoutes } from "packages/cloud/cloudRoutes";
import { CloudRoutes } from "packages/cloud/cloudRoutePaths";
import { useIntercom } from "packages/cloud/services/thirdParty/intercom";
import { useGetCloudWorkspace } from "packages/cloud/services/workspaces/CloudWorkspacesService";
import { WorkspacePopout } from "packages/cloud/views/workspaces/WorkspacePopout";
Expand Down

0 comments on commit 8c9e75b

Please sign in to comment.