@ampath/esm-login-app 8.0.0-next.10 → 8.0.0-next.14

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"login","online":true,"offline":true},{"component":"root","route":"logout","online":true,"offline":true},{"component":"root","route":"change-password","online":true,"offline":true}],"extensions":[{"name":"location-picker","slot":"location-picker","component":"locationPicker","online":true,"offline":true},{"name":"logout-button","slot":"user-panel-bottom-slot","component":"logoutButton","online":true,"offline":true},{"name":"password-changer","slot":"user-panel-slot","component":"changePasswordLink","online":true,"offline":true},{"name":"location-changer","slot":"top-nav-info-slot","component":"changeLocationLink","online":true,"offline":true,"order":1}],"modals":[{"name":"change-password-modal","component":"changePasswordModal"}],"version":"8.0.0-next.10"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"pages":[{"component":"root","route":"login","online":true,"offline":true},{"component":"root","route":"logout","online":true,"offline":true},{"component":"root","route":"change-password","online":true,"offline":true}],"extensions":[{"name":"location-picker","slot":"location-picker","component":"locationPicker","online":true,"offline":true},{"name":"logout-button","slot":"user-panel-bottom-slot","component":"logoutButton","online":true,"offline":true},{"name":"password-changer","slot":"user-panel-slot","component":"changePasswordLink","online":true,"offline":true},{"name":"location-changer","slot":"top-nav-info-slot","component":"changeLocationLink","online":true,"offline":true,"order":1}],"modals":[{"name":"change-password-modal","component":"changePasswordModal"}],"version":"8.0.0-next.14"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-login-app",
-  "version": "8.0.0-next.10",
+  "version": "8.0.0-next.14",
   "license": "MPL-2.0",
   "description": "The login microfrontend for the OpenMRS SPA",
   "browser": "dist/esm-login-app.js",

package/src/login/login.component.tsx

@@ -64,6 +64,12 @@ const Login: React.FC = () => {
       }
     }
   }, [showPasswordField, showPasswordOnSeparateScreen]);
+  useEffect(() => {
+    document.body.classList.add('hide-top-nav');
+    return () => {
+      document.body.classList.remove('hide-top-nav');
+    };
+  }, []);
 
   const continueLogin = useCallback(() => {
     const currentUsername = usernameInputRef.current?.value?.trim();
@@ -133,8 +139,9 @@ const Login: React.FC = () => {
               }
             } else if (!session.sessionLocation) {
               const uuid = session.user.person.uuid;
+              const email = await getEmail(uuid, username, password);
               try {
-                await getOtp(username, password, uuid);
+                await getOtp(username, password, email);
                 navigate('otp', {
                   state: {
                     username,

package/src/login/login.scss

@@ -2,6 +2,12 @@
 @use '@carbon/type';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
+/* Hide OpenMRS top nav on login */
+:global(.hide-top-nav #omrs-top-nav-app-container) {
+  display: none;
+  height: 0;
+}
+
 .bodyShort01 {
   @include type.type-style('body-compact-01');
 }
@@ -39,6 +45,7 @@
   align-items: center;
   position: relative;
   margin-left: 10rem;
+  min-height: 100vh;
 }
 
 .center {
@@ -171,15 +178,30 @@
   display: flex;
   flex-direction: row;
   gap: 10rem;
+  max-width: 100vw;
+  max-height: 100vh;
 }
 
 .image {
-  width: 50rem;
-  height: 55rem;
-  max-height: 60rem;
+  width: 100%;
+  height: 100%;
+  max-width: 100vw;
+  max-height: 100vh;
   object-fit: cover;
 }
 
+@media (max-width: 1024px) {
+  .image {
+    max-width: 40rem;
+  }
+}
+
+@media (max-width: 768px) {
+  .image {
+    max-width: 100%;
+  }
+}
+
 .poweredBy {
   display: flex;
   align-items: center;
@@ -212,7 +234,7 @@
   justify-content: space-between;
   align-items: center;
   padding: 0 layout.$spacing-04;
-  gap: 24rem;
+  gap: clamp(8rem, 27vw, 26rem);
 }
 
 .leftLogos {

package/src/otp/otp.module.scss

@@ -9,8 +9,8 @@
   margin-left: 5rem;
 }
 .leftSide {
-  margin-top: 10rem;
-  margin-left: 10rem;
+  margin-top: clamp(5rem, 10vw, 20rem);
+  margin-left: clamp(2rem, 5vw, 10rem);
 }
 
 .button {
@@ -36,9 +36,21 @@
 }
 
 .image {
-  width: 54rem;
-  height: 55rem;
-  max-height: 60rem;
+  width: 100%;
+  height: 100%;
+  max-width: 100vw;
+  max-height: 100vh;
   object-fit: cover;
-  flex-shrink: 0;
+}
+
+@media (max-width: 1024px) {
+  .image {
+    max-width: 40rem;
+  }
+}
+
+@media (max-width: 768px) {
+  .image {
+    max-width: 100%;
+  }
 }

package/src/resources/otp.resource.ts

@@ -8,7 +8,6 @@ export async function getEmail(uuid: string, username: string, password: string)
   const credentials = window.btoa(`${username}:${password}`);
   try {
     if (!uuid) return;
-
     const url = `${subDomain}/amrs/ws/rest/v1/person/${uuid}?v=custom:attributes`;
 
     const res = await openmrsFetch(url, {
@@ -31,11 +30,10 @@ export async function getEmail(uuid: string, username: string, password: string)
 
     const email = emailAttr?.value;
 
-    if (email) {
-      return email;
-    } else {
+    if (email === undefined || email === null) {
       throw new Error('Your email has not been configured. Please contact system administrator for assistance.');
     }
+    return email;
   } catch (error) {
     throw new Error(error.message ?? 'Failed to fetch email');
   }

package/yarnrc.yml

@@ -4,11 +4,11 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-npmPublishRegistry: "https://registry.npmjs.org"
+npmPublishRegistry: 'https://registry.npmjs.org'
 
 plugins:
   - checksum: c13ed363e15a826d9f779e7e7aca9dbee1d6d54813261d6f495da2fa94b01fa7579e516587ae2df5834f5d63d5d90cb392135190e8878b81dbd830c3c9f57809
     path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
-    spec: "https://go.mskelton.dev/yarn-outdated/v4"
+    spec: 'https://go.mskelton.dev/yarn-outdated/v4'
 
 yarnPath: .yarn/releases/yarn-4.10.3.cjs