[TASK-1059] Handle submission groups in Access Log UI

jsapp/js/account/security/accessLogs/accessLogsSection.component.tsx

@@ -0,0 +1,67 @@
+// Libraries
+import React from 'react';
+
+// Partial components
+import Button from 'js/components/common/button';
+import PaginatedQueryUniversalTable from 'js/universalTable/paginatedQueryUniversalTable.component';
+
+// Utilities
+import useAccessLogsQuery, {type AccessLog} from 'js/query/queries/accessLogs.query';
+import {formatTime} from 'js/utils';
+import sessionStore from 'js/stores/session';
+
+// Styles
+import securityStyles from 'js/account/security/securityRoute.module.scss';
+
+export default function AccessLogsSection() {
+  function logOutAllSessions() {
+    sessionStore.logOutAll();
+  }
+
+  return (
+    <>
+      <header className={securityStyles.securityHeader}>
+        <h2 className={securityStyles.securityHeaderText}>
+          {t('Recent account activity')}
+        </h2>
+
+        <div className={securityStyles.securityHeaderActions}>
+          <Button
+            type='text'
+            size='m'
+            onClick={logOutAllSessions}
+            label={t('Log out of all devices')}
+            startIcon='logout'
+          />
+        </div>
+      </header>
+
+      <PaginatedQueryUniversalTable<AccessLog>
+        queryHook={useAccessLogsQuery}
+        columns={[
+          // The `key`s of these columns are matching the `AccessLog` interface
+          // properties (from `accessLogs.query.ts` file) using dot notation.
+          {
+            key: 'metadata.source',
+            label: t('Source'),
+            cellFormatter: (log: AccessLog) => {
+              if (log.metadata.auth_type === 'submission-group') {
+                return t('Data Submissions (##count##)').replace('##count##', String(log.count));
+              } else {
+                return log.metadata.source;
+              }
+            },
+          },
+          {
+            key: 'date_created',
+            label: t('Last activity'),
+            cellFormatter: (log: AccessLog) => {
+              return formatTime(log.date_created);
+            },
+          },
+          {key: 'metadata.ip_address', label: t('IP Address')},
+        ]}
+      />
+    </>
+  );
+}

jsapp/js/account/security/apiToken/apiTokenSection.component.tsx

@@ -1,12 +1,21 @@
+// Libraries
 import React, {
   useState,
   useEffect,
 } from 'react';
-import {dataInterface} from 'js/dataInterface';
+import cx from 'classnames';
+
+// Partial components
 import TextBox from 'js/components/common/textBox';
 import Button from 'js/components/common/button';
+
+// Utils
+import {dataInterface} from 'js/dataInterface';
 import {notify} from 'js/utils';
+
+// Styles
 import styles from './apiTokenSection.module.scss';
+import securityStyles from 'js/account/security/securityRoute.module.scss';
 
 const HIDDEN_TOKEN_VALUE = '*'.repeat(40);
 
@@ -42,28 +51,28 @@ export default function ApiTokenDisplay() {
   }, [isVisible]);
 
   return (
-  <div className={styles.root}>
-    <div className={styles.titleSection}>
-      <h2 className={styles.title}>{t('API Key')}</h2>
-    </div>
-
-    <div className={styles.bodySection}>
-      <TextBox
-        type={isVisible && !isFetching && token !== null ? 'text' : 'password'}
-        value={token !== null ? token : HIDDEN_TOKEN_VALUE}
-        readOnly
-      />
-    </div>
+    <section className={securityStyles.securitySection}>
+      <div className={securityStyles.securitySectionTitle}>
+        <h2 className={securityStyles.securitySectionTitleText}>{t('API Key')}</h2>
+      </div>
 
-    <div className={styles.optionsSection}>
-      <Button
-        label='Display'
-        size='m'
-        type='secondary'
-        onClick={toggleTokenVisibility}
-      />
-    </div>
-  </div>
+      <div className={cx(securityStyles.securitySectionBody, styles.body)}>
+        <TextBox
+          type={isVisible && !isFetching && token !== null ? 'text' : 'password'}
+          value={token !== null ? token : HIDDEN_TOKEN_VALUE}
+          readOnly
+          className={styles.token}
+        />
+      </div>
 
+      <div className={styles.options}>
+        <Button
+          label='Display'
+          size='m'
+          type='primary'
+          onClick={toggleTokenVisibility}
+        />
+      </div>
+    </section>
   );
 }

jsapp/js/account/security/apiToken/apiTokenSection.module.scss

@@ -2,59 +2,19 @@
 @use 'scss/sizes';
 @use 'scss/libs/_mdl';
 
-.root {
-  margin-top: sizes.$x20;
-  margin-bottom: sizes.$x60;
-  padding-top: sizes.$x14;
-  display: flex;
-  align-items: baseline;
-  column-gap: sizes.$x16;
-  border-top: sizes.$x1 solid;
-  border-color: colors.$kobo-gray-300;
-}
-
-.titleSection {
-  flex: 2;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-.title {
-  margin: 0;
-  color: colors.$kobo-gray-700;
-  font-weight: 600;
-  line-height: 1.6;
+.body {
+  flex: 5;
 }
 
-.bodySection {
-  flex: 6;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex-wrap: wrap;
-  padding-left: sizes.$x4;
-
-  label {
-    display: inline-block;
-    vertical-align: top;
-    width: 100%;
-
-    input {
-      // API token display
-      font-family: mdl.$font_mono;
-      // 40 characters + padding + border
-      max-width: calc(40ch + 22px);
-    }
+.token {
+  input {
+    // API token display
+    font-family: mdl.$font_mono;
   }
 }
 
-.optionsSection {
-  flex: 2;
-  text-align: right;
-
-  button {
-    display: inline-block;
-  }
+.options {
+  flex: 3;
+  display: flex;
+  justify-content: flex-end;
 }

jsapp/js/account/security/email/emailSection.component.tsx

@@ -1,17 +1,27 @@
+// Libraries
 import React, {useEffect, useState} from 'react';
+import cx from 'classnames';
+
+// Stores and email related
 import sessionStore from 'js/stores/session';
 import {
   getUserEmails,
   setUserEmail,
   deleteUnverifiedUserEmails,
 } from './emailSection.api';
 import type {EmailResponse} from './emailSection.api';
-import style from './emailSection.module.scss';
+
+// Partial components
 import Button from 'jsapp/js/components/common/button';
 import TextBox from 'jsapp/js/components/common/textBox';
 import Icon from 'jsapp/js/components/common/icon';
-import {formatTime} from 'jsapp/js/utils';
-import {notify} from 'js/utils';
+
+// Utils
+import {formatTime, notify} from 'js/utils';
+
+// Styles
+import styles from './emailSection.module.scss';
+import securityStyles from 'js/account/security/securityRoute.module.scss';
 
 interface EmailState {
   emails: EmailResponse[];
@@ -23,9 +33,14 @@ interface EmailState {
 export default function EmailSection() {
   const [session] = useState(() => sessionStore);
 
+  let initialEmail = '';
+  if ('email' in session.currentAccount) {
+    initialEmail = session.currentAccount.email;
+  }
+
   const [email, setEmail] = useState<EmailState>({
     emails: [],
-    newEmail: '',
+    newEmail: initialEmail,
     refreshedEmail: false,
     refreshedEmailDate: '',
   });
@@ -103,26 +118,31 @@ export default function EmailSection() {
   );
 
   return (
-    <div className={style.root}>
-      <div className={style.titleSection}>
-        <h2 className={style.title}>{t('Email address')}</h2>
+    <section className={securityStyles.securitySection}>
+      <div className={securityStyles.securitySectionTitle}>
+        <h2 className={securityStyles.securitySectionTitleText}>{t('Email address')}</h2>
       </div>
 
-      <div className={style.bodySection}>
+      <div className={cx(securityStyles.securitySectionBody, styles.body)}>
         {!session.isPending &&
           session.isInitialLoadComplete &&
           'email' in currentAccount && (
-            <p className={style.currentEmail}>{currentAccount.email}</p>
+            <TextBox
+              value={email.newEmail}
+              placeholder={t('Type new email address')}
+              onChange={onTextFieldChange.bind(onTextFieldChange)}
+              type='email'
+            />
           )}
 
         {unverifiedEmail?.email &&
           !session.isPending &&
           session.isInitialLoadComplete &&
           'email' in currentAccount && (
             <>
-              <div className={style.unverifiedEmail}>
+              <div className={styles.unverifiedEmail}>
                 <Icon name='alert' />
-                <p className={style['blurb']}>
+                <p className={styles.blurb}>
                   <strong>
                     {t('Check your email ##UNVERIFIED_EMAIL##. ').replace(
                       '##UNVERIFIED_EMAIL##',
@@ -136,7 +156,7 @@ export default function EmailSection() {
                 </p>
               </div>
 
-              <div className={style.editEmail}>
+              <div className={styles.editEmail}>
                 <Button
                   label='Resend'
                   size='m'
@@ -167,27 +187,19 @@ export default function EmailSection() {
       </div>
 
       <form
-        className={style.optionsSection}
+        className={styles.options}
         onSubmit={(e) => {
           e.preventDefault();
           handleSubmit();
         }}
       >
-        {/*TODO: Move TextBox into a modal--it messes up the flow of the row right now*/}
-        <TextBox
-          value={email.newEmail}
-          placeholder={t('Type new email address')}
-          onChange={onTextFieldChange.bind(onTextFieldChange)}
-          type='email'
-        />
-
         <Button
           label='Change'
           size='m'
-          type='secondary'
+          type='primary'
           onClick={handleSubmit}
         />
       </form>
-    </div>
+    </section>
   );
 }

jsapp/js/account/security/email/emailSection.module.scss

@@ -1,49 +1,14 @@
 @use 'scss/colors';
 @use 'scss/sizes';
-@use 'scss/libs/_mdl';
 
-.root {
-  margin-top: sizes.$x20;
-  margin-bottom: sizes.$x60;
-  padding-top: sizes.$x14;
-  display: flex;
-  align-items: baseline;
-  column-gap: sizes.$x16;
-  border-top: sizes.$x1 solid;
-  border-color: colors.$kobo-gray-300;
-}
-
-.titleSection {
-  flex: 2;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-.title {
-  margin: 0;
-  color: colors.$kobo-gray-700;
-  font-weight: 600;
-  line-height: 1.6;
-}
-
-.bodySection {
+.body {
   flex: 5;
-  flex-direction: row;
-  align-items: center;
-  flex-wrap: wrap;
-  padding-left: sizes.$x16;
 }
 
-.optionsSection {
-  flex: 3; // widen for email input
-
-  // stack input and button, right-aligned.
+.options {
+  flex: 3;
   display: flex;
-  flex-direction: column;
-  row-gap: sizes.$x12;
-  align-items: flex-end;
+  justify-content: flex-end;
 }
 
 .currentEmail {