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

Merge branch '261-min-329-minerva-version' into 'development'

Resolve "[MIN-329] minerva version"

Closes #261

See merge request !187
parents 2fa8bea8 07099e7d
No related branches found
No related tags found
2 merge requests!223reset the pin numbers before search results are fetch (so the results will be...,!187Resolve "[MIN-329] minerva version"
Pipeline #89350 passed
...@@ -6,6 +6,8 @@ import { useAppDispatch } from '@/redux/hooks/useAppDispatch'; ...@@ -6,6 +6,8 @@ import { useAppDispatch } from '@/redux/hooks/useAppDispatch';
import { openLegend } from '@/redux/legend/legend.slice'; import { openLegend } from '@/redux/legend/legend.slice';
import { openPluginsDrawer } from '@/redux/plugins/plugins.slice'; import { openPluginsDrawer } from '@/redux/plugins/plugins.slice';
import { IconButton } from '@/shared/IconButton'; import { IconButton } from '@/shared/IconButton';
import { store } from '@/redux/store';
import Image from 'next/image'; import Image from 'next/image';
export const NavBar = (): JSX.Element => { export const NavBar = (): JSX.Element => {
...@@ -28,6 +30,9 @@ export const NavBar = (): JSX.Element => { ...@@ -28,6 +30,9 @@ export const NavBar = (): JSX.Element => {
dispatch(openLegend()); dispatch(openLegend());
}; };
const configuration = store.getState().configuration.main.data;
const version = configuration ? `(v${configuration.version})` : '';
return ( return (
<div className="flex min-h-full w-[88px] flex-col items-center justify-between overflow-y-auto bg-cultured py-8"> <div className="flex min-h-full w-[88px] flex-col items-center justify-between overflow-y-auto bg-cultured py-8">
<div data-testid="nav-buttons"> <div data-testid="nav-buttons">
...@@ -56,7 +61,7 @@ export const NavBar = (): JSX.Element => { ...@@ -56,7 +61,7 @@ export const NavBar = (): JSX.Element => {
<span className="h-16 w-14 text-center text-[8px] leading-4"> <span className="h-16 w-14 text-center text-[8px] leading-4">
Powered by: MINERVA Platform{' '} Powered by: MINERVA Platform{' '}
<a href={MINERVA_WEBSITE_URL} target="_blank"> <a href={MINERVA_WEBSITE_URL} target="_blank">
(v16.0.8) {version}
</a> </a>
</span> </span>
</div> </div>
......
...@@ -58,6 +58,7 @@ export const fetchInitialAppData = createAsyncThunk< ...@@ -58,6 +58,7 @@ export const fetchInitialAppData = createAsyncThunk<
/** Fetch all data required for rendering map */ /** Fetch all data required for rendering map */
await Promise.all([ await Promise.all([
dispatch(getConfiguration()),
dispatch(getConfigurationOptions()), dispatch(getConfigurationOptions()),
dispatch(getProjectById(PROJECT_ID)), dispatch(getProjectById(PROJECT_ID)),
dispatch(getAllBackgroundsByProjectId(PROJECT_ID)), dispatch(getAllBackgroundsByProjectId(PROJECT_ID)),
...@@ -78,7 +79,6 @@ export const fetchInitialAppData = createAsyncThunk< ...@@ -78,7 +79,6 @@ export const fetchInitialAppData = createAsyncThunk<
// Fetch data needed for export // Fetch data needed for export
dispatch(getStatisticsById(PROJECT_ID)); dispatch(getStatisticsById(PROJECT_ID));
dispatch(getConfiguration());
// Fetch plugins list // Fetch plugins list
dispatch(getAllPlugins()); dispatch(getAllPlugins());
......
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