Skip to content
Snippets Groups Projects
Commit 0f158a64 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

after signing in with orcid id list of projects is presented

parent cb0a6059
No related branches found
No related tags found
2 merge requests!231Development,!225Resolve "ORCID Sign in"
Pipeline #94020 passed
......@@ -57,6 +57,11 @@ export const Modal = (): React.ReactNode => {
<AccessDeniedModal />
</ModalLayout>
)}
{isOpen && modalName === 'select-project' && (
<ModalLayout>
<AccessDeniedModal />
</ModalLayout>
)}
{isOpen && modalName === 'add-comment' && (
<ModalLayout>
<AddCommentModal />
......
......@@ -29,6 +29,7 @@ export const ModalLayout = ({ children }: ModalLayoutProps): JSX.Element => {
'flex h-5/6 w-10/12 flex-col overflow-hidden rounded-lg',
modalName === 'login' && 'h-auto w-[400px]',
modalName === 'access-denied' && 'h-auto w-[400px]',
modalName === 'select-project' && 'h-auto w-[400px]',
modalName === 'add-comment' && 'h-auto w-[400px]',
modalName === 'error-report' && 'h-auto w-[800px]',
['edit-overlay', 'logged-in-menu'].includes(modalName) && 'h-auto w-[432px]',
......
......@@ -73,6 +73,12 @@ export const openAccessDeniedModalReducer = (state: ModalState): void => {
state.modalTitle = 'Access denied!';
};
export const openSelectProjectModalReducer = (state: ModalState): void => {
state.isOpen = true;
state.modalName = 'select-project';
state.modalTitle = 'Select project!';
};
export const setOverviewImageIdReducer = (
state: ModalState,
action: PayloadAction<number>,
......
......@@ -13,6 +13,7 @@ import {
openAddCommentModalReducer,
openErrorReportModalReducer,
openAccessDeniedModalReducer,
openSelectProjectModalReducer,
} from './modal.reducers';
const modalSlice = createSlice({
......@@ -31,6 +32,7 @@ const modalSlice = createSlice({
openLoggedInMenuModal: openLoggedInMenuModalReducer,
openErrorReportModal: openErrorReportModalReducer,
openAccessDeniedModal: openAccessDeniedModalReducer,
openSelectProjectModal: openSelectProjectModalReducer,
},
});
......@@ -47,6 +49,7 @@ export const {
openLoggedInMenuModal,
openErrorReportModal,
openAccessDeniedModal,
openSelectProjectModal,
} = modalSlice.actions;
export default modalSlice.reducer;
......@@ -12,6 +12,8 @@ import {
getDrugAutocomplete,
getSearchAutocomplete,
} from '@/redux/autocomplete/autocomplete.thunks';
import { openSelectProjectModal } from '@/redux/modal/modal.slice';
import { getProjects } from '@/redux/projects/projects.thunks';
import { getAllBackgroundsByProjectId } from '../backgrounds/backgrounds.thunks';
import { getConfiguration, getConfigurationOptions } from '../configuration/configuration.thunks';
import {
......@@ -117,4 +119,8 @@ export const fetchInitialAppData = createAsyncThunk<
dispatch(openOverlaysDrawer());
}
}
if (queryData.oauthLogin === 'success') {
await dispatch(getProjects());
dispatch(openSelectProjectModal());
}
});
......@@ -8,4 +8,5 @@ export type ModalName =
| 'edit-overlay'
| 'error-report'
| 'access-denied'
| 'select-project'
| 'logged-in-menu';
......@@ -9,6 +9,7 @@ export interface QueryData {
initialPosition?: Partial<Point>;
overlaysId?: number[];
pluginsId?: string[];
oauthLogin?: string;
}
export interface QueryDataParams {
......@@ -35,4 +36,5 @@ export interface QueryDataRouterParams {
z?: string;
overlaysId?: string;
pluginsId?: string;
oauthLogin?: string;
}
......@@ -13,4 +13,5 @@ export const parseQueryToTypes = (query: QueryDataRouterParams): QueryData => ({
},
overlaysId: query.overlaysId?.split(',').map(Number),
pluginsId: query.pluginsId?.split(',').map(String),
oauthLogin: query.oauthLogin,
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment