From f930f96d1b389e239d05e865afe4db339cb49cbf Mon Sep 17 00:00:00 2001 From: burnettk Date: Wed, 19 Oct 2022 15:17:20 -0400 Subject: [PATCH] Squashed 'spiffworkflow-frontend/' changes from bf2d2a224..7f1f0b359 7f1f0b359 Merge branch 'main' of github.com:sartography/spiffworkflow-frontend 03499ae0c add the redirect url back into the call to connector proxy c0199ebf2 Merge pull request #91 from sartography/bugfix/style-of-date-selection 96880aee2 comment 63c24e024 Json Web Form CSS Fix - Bootsrtrap now requires that each li have a "list-inline-item", also have a PR in on this with the react-jsonschema-form. git-subtree-dir: spiffworkflow-frontend git-subtree-split: 7f1f0b3596b567d705b159b1df975113b75a2825 --- src/index.css | 8 ++++++++ src/routes/AuthenticationList.tsx | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/index.css b/src/index.css index 214dd1f2..fd156c23 100644 --- a/src/index.css +++ b/src/index.css @@ -86,3 +86,11 @@ span.bjs-crumb { .markdown tbody tr:nth-of-type(odd) { background: rgba(0,0,0,.05); } + +/* Json Web Form CSS Fix - Bootstrap now requries that each li have a "list-inline-item." Also have a PR + in on this with the react-jsonschema-form repo. This is just a patch fix to allow date inputs to layout a little more cleanly */ +.list-inline>li { + display: inline-block; + padding-right: 5px; + padding-left: 5px; +} diff --git a/src/routes/AuthenticationList.tsx b/src/routes/AuthenticationList.tsx index ab9789f1..6be0f054 100644 --- a/src/routes/AuthenticationList.tsx +++ b/src/routes/AuthenticationList.tsx @@ -3,6 +3,7 @@ import { Table } from 'react-bootstrap'; import ErrorContext from '../contexts/ErrorContext'; import { AuthenticationItem } from '../interfaces'; import HttpService from '../services/HttpService'; +import UserService from '../services/UserService'; export default function AuthenticationList() { const setErrorMessage = (useContext as any)(ErrorContext)[1]; @@ -13,11 +14,13 @@ export default function AuthenticationList() { const [connectProxyBaseUrl, setConnectProxyBaseUrl] = useState( null ); + const [redirectUrl, setRedirectUrl] = useState(null); useEffect(() => { const processResult = (result: any) => { setAuthenticationList(result.results); setConnectProxyBaseUrl(result.connector_proxy_base_url); + setRedirectUrl(result.redirect_url); }; HttpService.makeCallToBackend({ path: `/authentications`, @@ -34,7 +37,11 @@ export default function AuthenticationList() { {row.id}