Skip to content

chore: remove circular dependencies #17585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 28, 2025
Merged

chore: remove circular dependencies #17585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
350070e
chore: move useAuthenticated hook to remove circular dependency
brettkolodny Apr 28, 2025
cc6df5f
chore: create LoginPage/Language.ts to remove circular dependency
brettkolodny Apr 28, 2025
8201297
chore: create ExperimentalFormContext.tsx to remove circular depencency
brettkolodny Apr 28, 2025
a78afde
fix: use correct file path for import
brettkolodny Apr 28, 2025
7781229
chore: add dpdm as a dev dependency
brettkolodny Apr 28, 2025
a2a1c19
Merge branch 'main' into brett/remove-circular-deps
brettkolodny Apr 28, 2025
d945f7b
chore: format
brettkolodny Apr 28, 2025
e067178
chore: alphabetize exports
brettkolodny Apr 28, 2025
64e6b3d
refactor: co-locate context
brettkolodny Apr 28, 2025
dca8d8f
fix: format
brettkolodny Apr 28, 2025
5b711a3
chore: add circular-deps lint to lint command and CI
brettkolodny Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: create LoginPage/Language.ts to remove circular dependency
  • Loading branch information
@brettkolodny
brettkolodny committed Apr 28, 2025
commit cc6df5f6f984cb1419a944b9664cbae8c17aa81f
9 changes: 9 additions & 0 deletions site/src/pages/LoginPage/Language.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export const Language = {
emailLabel: "Email",
passwordLabel: "Password",
emailInvalid: "Please enter a valid email address.",
emailRequired: "Please enter an email address.",
passwordSignIn: "Sign In",
githubSignIn: "GitHub",
oidcSignIn: "OpenID Connect",
};
2 changes: 1 addition & 1 deletion site/src/pages/LoginPage/LoginPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
waitForLoaderToBeRemoved,
} from "testHelpers/renderHelpers";
import { server } from "testHelpers/server";
import { Language } from "./Language";
import { LoginPage } from "./LoginPage";
import { Language } from "./SignInForm";

describe("LoginPage", () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/LoginPage/OAuthSignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Button from "@mui/material/Button";
import { visuallyHidden } from "@mui/utils";
import type { AuthMethods } from "api/typesGenerated";
import { type FC, useId } from "react";
import { Language } from "./SignInForm";
import { Language } from "./Language";

const iconStyles = {
width: 16,
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/LoginPage/PasswordSignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { FC } from "react";
import { Link as RouterLink } from "react-router-dom";
import { getFormHelpers, onChangeTrimmed } from "utils/formUtils";
import * as Yup from "yup";
import { Language } from "./SignInForm";
import { Language } from "./Language";

type PasswordSignInFormProps = {
onSubmit: (credentials: { email: string; password: string }) => void;
Expand Down
10 changes: 0 additions & 10 deletions site/src/pages/LoginPage/SignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,6 @@ import { getApplicationName } from "utils/appearance";
import { OAuthSignInForm } from "./OAuthSignInForm";
import { PasswordSignInForm } from "./PasswordSignInForm";

export const Language = {
emailLabel: "Email",
passwordLabel: "Password",
emailInvalid: "Please enter a valid email address.",
emailRequired: "Please enter an email address.",
passwordSignIn: "Sign In",
githubSignIn: "GitHub",
oidcSignIn: "OpenID Connect",
};

const styles = {
root: {
width: "100%",
Expand Down