Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

215 notification about auth transitioning #216

Merged
merged 4 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]

### Added
- Warning on landing page notifying user to reset your password. [#215](https://github.com/IN-CORE/incore-ui/issues/215)
- Incore-theme for emails sent through KeyCloak. [#212](https://github.com/IN-CORE/incore-ui/issues/212)

### Changed
Expand Down
12 changes: 12 additions & 0 deletions src/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -731,3 +731,15 @@ export async function getRepoVersion() {
return githubVersionResponseFallback;
}
}

export const OPEN_WARNING_MESSAGE = "OPEN_WARNING_MESSAGE";
export const CLOSE_WARNING_MESSAGE = "CLOSE_WARNING_MESSAGE";

export const openWarningMessage = (message) => ({
type: OPEN_WARNING_MESSAGE,
message: message,
});

export const closeWarningMessage = () => ({
type: CLOSE_WARNING_MESSAGE,
});
6 changes: 5 additions & 1 deletion src/app.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,8 @@ config["keycloakConfig"] = {
clientId: config["client_id"]
};

export default config;
config["resetPwWarningMessage"] = "NOTE: Changes were recently made to IN-CORE's user management system. If you were " +
"registered as an IN-CORE user before 08/21/2024 and are experiencing login issues, you need to reset your " +
"password.";

export default config;
7 changes: 7 additions & 0 deletions src/components/HomePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import QuestionAnswerIcon from "@material-ui/icons/QuestionAnswer";
import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown";
import ArrowDropUpIcon from "@material-ui/icons/ArrowDropUp";
import { trackPageview, trackEvent } from "./analytics";
import { openWarningMessage } from "../actions/index";
import { WarningMessage } from "./children/WarningMessage";
import { useDispatch } from "react-redux";

const useStyles = makeStyles((theme) => ({
root: {
Expand Down Expand Up @@ -348,17 +351,21 @@ const HomePage = () => {
};

const classes = useStyles();
const dispatch = useDispatch();

React.useEffect(() => {
getRepoVersion().then((data) => {
setGithubVersions(data);
});
// Call trackPageview to track page view
trackPageview(window.location.pathname);

dispatch(openWarningMessage(config.resetPwWarningMessage));
}, []);

return (
<div>
<WarningMessage />
{/*header*/}
<section className={classes.root}>
<Container className={classes.container}>
Expand Down
40 changes: 40 additions & 0 deletions src/components/children/WarningMessage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import React from "react";
import { Alert } from "@material-ui/lab";
import { Collapse, IconButton } from "@material-ui/core";
import CloseIcon from "@material-ui/icons/Close";
import { useDispatch, useSelector } from "react-redux";
import { closeWarningMessage} from "../../actions";

export const WarningMessage = () => {

const dispatch = useDispatch();
const { messageOpen, error, message } = useSelector(
(state) => state.warning
);

const handleClose = () => {
dispatch(closeWarningMessage());
};

return (
<Collapse in={messageOpen}>
<Alert
severity="warning"
action={
<>
<IconButton
aria-label="close"
color="inherit"
size="small"
onClick={handleClose}
>
<CloseIcon fontSize="inherit" />
</IconButton>
</>
}
>
{message}
</Alert>
</Collapse>
);
};
4 changes: 3 additions & 1 deletion src/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import datatypes from "./datatypes";
import semantics from "./semantics";
import usage from "./usage";
import user from "./user.ts";
import warning from "./warning";

const rootReducer = combineReducers({
routing: routerReducer,
Expand All @@ -20,7 +21,8 @@ const rootReducer = combineReducers({
space: spaces,
user: user,
datatype: datatypes,
semantics: semantics
semantics: semantics,
warning: warning
});

export default rootReducer;
27 changes: 27 additions & 0 deletions src/reducers/warning.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { OPEN_WARNING_MESSAGE, CLOSE_WARNING_MESSAGE } from "../actions/index";

const initialState = {
messageOpen: false,
message: "",
};

const warning = (state = initialState, action) => {
switch (action.type) {
case OPEN_WARNING_MESSAGE:
return {
...state,
messageOpen: true,
message: action.message,
};
case CLOSE_WARNING_MESSAGE:
return {
...state,
messageOpen: false,
message: "",
};
default:
return state;
}
};

export default warning;
Loading