19690: dummy option now displays in colimn-selector

[arvados-workbench2.git] / src / store / token-dialog / token-dialog-actions.tsx

diff --git a/src/store/token-dialog/token-dialog-actions.tsx b/src/store/token-dialog/token-dialog-actions.tsx
index 2cf573bcae8a004607fb667d16e44a212dafeaef..6d07fa0ac12c1ea7d2178ebb9aba65557edfe37c 100644 (file)
--- a/src/store/token-dialog/token-dialog-actions.tsx
+++ b/src/store/token-dialog/token-dialog-actions.tsx
@@ -2,16 +2,17 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { dialogActions } from "~/store/dialog/dialog-actions";
-import { getProperty } from '~/store/properties/properties';
-import { propertiesActions } from '~/store/properties/properties-actions';
-import { RootState } from '~/store/store';
+import { dialogActions } from "store/dialog/dialog-actions";
+import { getProperty } from 'store/properties/properties';
+import { propertiesActions } from 'store/properties/properties-actions';
+import { RootState } from 'store/store';
 
 export const TOKEN_DIALOG_NAME = 'tokenDialog';
 const API_HOST_PROPERTY_NAME = 'apiHost';
 
 export interface TokenDialogData {
     token: string;
+    tokenExpiration?: Date;
     apiHost: string;
     canCreateNewTokens: boolean;
 }
@@ -26,6 +27,9 @@ export const getTokenDialogData = (state: RootState): TokenDialogData => {
     return {
         apiHost: getProperty<string>(API_HOST_PROPERTY_NAME)(state.properties) || '',
         token: state.auth.extraApiToken || state.auth.apiToken || '',
+        tokenExpiration: state.auth.extraApiToken
+            ? state.auth.extraApiTokenExpiration
+            : state.auth.apiTokenExpiration,
         canCreateNewTokens,
     };
 };