Merge branch '16314-test-user-db'

refs #16314

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --git a/src/common/config.ts b/src/common/config.ts
index cf539f3dd51856783b56dd6a90192c1dd69fe319..dd812c65bb488cce168fa6a178b4529a0cc58206 100644 (file)
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -76,6 +76,9 @@ export interface ClusterConfigJSON {
         SSO: {
             Enable: boolean;
         }
+        Test: {
+            Enable: boolean;
+        }
     };
     Collections: {
         ForwardSlashNameSubstitution: string;
@@ -231,6 +234,9 @@ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
         SSO: {
             Enable: false,
         },
+        Test: {
+            Enable: false,
+        },
     },
     Collections: {
         ForwardSlashNameSubstitution: "",

diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx
index c857c0b287efbf382c4a0c0c55278a0ec4aeb6cf..4538802b51403ed231702182c38f649c1b2cf1e4 100644 (file)
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@ -70,7 +70,7 @@ type LoginPanelProps = DispatchProp<any> & WithStyles<CssRules> & {
     passwordLogin: boolean,
 };
 
-const loginOptions = ['LDAP', 'PAM'];
+const loginOptions = ['LDAP', 'PAM', 'Test'];
 
 export const requirePasswordLogin = (config: Config): boolean => {
     if (config && config.clusterConfig && config.clusterConfig.Login) {