Rename passwordOnSeparateScreen to showPasswordOnSeparateScreen

openmrs · Dec 6, 2023 · 915f30e · 915f30e
1 parent 53145eb
commit 915f30e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/packages/apps/esm-login-app/__mocks__/config.mock.ts b/packages/apps/esm-login-app/__mocks__/config.mock.ts
@@ -19,5 +19,5 @@ export const mockConfig: ConfigSchema = {
   links: {
     loginSuccess: "${openmrsSpaBase}/home",
   },
-  passwordOnSeparateScreen: true,
+  showPasswordOnSeparateScreen: true,
 };
diff --git a/packages/apps/esm-login-app/src/config-schema.ts b/packages/apps/esm-login-app/src/config-schema.ts
@@ -71,7 +71,7 @@ export const configSchema = {
       _description: "Alt text, shown on hover",
     },
   },
-  passwordOnSeparateScreen: {
+  showPasswordOnSeparateScreen: {
     _type: Type.Boolean,
     _default: true,
     _description:
@@ -98,5 +98,5 @@ export interface ConfigSchema {
     src: string;
     alt: string;
   };
-  passwordOnSeparateScreen: boolean;
+  showPasswordOnSeparateScreen: boolean;
 }
diff --git a/packages/apps/esm-login-app/src/login/login.component.tsx b/packages/apps/esm-login-app/src/login/login.component.tsx
@@ -40,7 +40,7 @@ export interface LoginProps extends LoginReferrer {}
 
 const Login: React.FC<LoginProps> = () => {
   const config = useConfig();
-  const { passwordOnSeparateScreen } = config;
+  const { showPasswordOnSeparateScreen } = config;
   const isLoginEnabled = useConnectivity();
   const { t } = useTranslation();
   const { user } = useSession();
@@ -56,7 +56,7 @@ const Login: React.FC<LoginProps> = () => {
 
   const showUsername = location.pathname === "/login";
   const showPassword =
-    !passwordOnSeparateScreen || location.pathname === "/login/confirm";
+    !showPasswordOnSeparateScreen || location.pathname === "/login/confirm";
 
   const handleLogin = useCallback(
     (session: Session) => {
@@ -199,7 +199,7 @@ const Login: React.FC<LoginProps> = () => {
           />
         )}
         <Tile className={styles["login-card"]}>
-          {passwordOnSeparateScreen && showPassword ? (
+          {showPasswordOnSeparateScreen && showPassword ? (
             <div className={styles["back-button-div"]}>
               <Button
                 className={styles["back-button"]}
@@ -234,7 +234,7 @@ const Login: React.FC<LoginProps> = () => {
                   required
                 />
                 {/* For password managers */}
-                {passwordOnSeparateScreen && (
+                {showPasswordOnSeparateScreen && (
                   <input
                     id="password"
                     style={hidden}
@@ -244,7 +244,7 @@ const Login: React.FC<LoginProps> = () => {
                     onChange={changePassword}
                   />
                 )}
-                {passwordOnSeparateScreen && (
+                {showPasswordOnSeparateScreen && (
                   <Button
                     className={styles.continueButton}
                     renderIcon={(props) => <ArrowRight size={24} {...props} />}
@@ -275,7 +275,7 @@ const Login: React.FC<LoginProps> = () => {
                   showPasswordLabel="Show password"
                 />
                 {/* For password managers */}
-                {passwordOnSeparateScreen && (
+                {showPasswordOnSeparateScreen && (
                   <input
                     id="username"
                     type="text"

diff --git a/packages/apps/esm-login-app/src/login/login.test.tsx b/packages/apps/esm-login-app/src/login/login.test.tsx
@@ -169,10 +169,10 @@ describe("Login", () => {
     await user.click(screen.getByRole("button", { name: /log in/i }));
   });
 
-  it("should render the both the username and password fields when the passwordOnSeparateScreen config is false", async () => {
+  it("should render the both the username and password fields when the showPasswordOnSeparateScreen config is false", async () => {
     mockedUseConfig.mockReturnValue({
       ...mockConfig,
-      passwordOnSeparateScreen: false,
+      showPasswordOnSeparateScreen: false,
     });
 
     renderWithRouter(
@@ -194,7 +194,7 @@ describe("Login", () => {
     expect(loginButton).toBeInTheDocument();
   });
 
-  it("should not render the password field when the passwordOnSeparateScreen config is true (default)", async () => {
+  it("should not render the password field when the showPasswordOnSeparateScreen config is true (default)", async () => {
     mockedUseConfig.mockReturnValue({
       ...mockConfig,
     });
@@ -218,11 +218,11 @@ describe("Login", () => {
     expect(loginButton).not.toBeInTheDocument();
   });
 
-  it("should be able to login when the passwordOnSeparateScreen config is false", async () => {
+  it("should be able to login when the showPasswordOnSeparateScreen config is false", async () => {
     mockedLogin.mockReturnValue(Promise.resolve({ some: "data" }));
     mockedUseConfig.mockReturnValue({
       ...mockConfig,
-      passwordOnSeparateScreen: false,
+      showPasswordOnSeparateScreen: false,
     });
     const user = userEvent.setup();
     mockedLogin.mockClear();