Commit 51acc79a authored by Matija Obreza's avatar Matija Obreza

Merge branch '412-dashboard-information' into 'master'

Dashboard information

Closes #412

See merge request !329
parents c4f29a48 2dc34fa9
Pipeline #8060 passed with stages
in 5 minutes and 53 seconds
......@@ -37,6 +37,9 @@
},
"bottomSection": {
"allFields": "* All fields marked with * are required."
},
"dashboardMoved": {
"movedText": "Managing Descriptors, Descriptor lists and Datasets has moved. Please resume your work on the new website"
}
},
"f": {
......
import DatasetSuggestionsPage from 'datasets/ui/search/SuggestionsPage';
import DatasetBrowsePage from 'datasets/ui/BrowsePage';
import DatasetDisplayPage from 'datasets/ui/DisplayPage';
import DatasetStepper from 'datasets/ui/dataset-stepper';
import DatasetDashboardPage from 'datasets/ui/DashboardPage';
import datasetSteps from 'datasets/ui/dataset-stepper/steps';
import BasicInfoStep from 'datasets/ui/dataset-stepper/steps/basic-info';
import DashboardMoved from 'ui/catalog/dashboard/c/DashboardMoved';
import { ROLE_ADMINISTRATOR, ROLE_USER } from 'constants/userRoles';
import Wrapper from 'ui/catalog/Wrapper';
......@@ -41,7 +39,7 @@ const publicRoutes = [
const dashboardRoutes = [
{
path: '/datasets/edit',
component: DatasetStepper,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
title: 'datasets.dashboard.p.stepper.publisher',
......@@ -49,14 +47,14 @@ const dashboardRoutes = [
routes: [
{
path: '/',
component: BasicInfoStep,
component: DashboardMoved,
exact: true,
},
],
},
{
path: '/datasets/:uuid/',
component: DatasetStepper,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
title: 'datasets.dashboard.p.stepper.publisher',
......@@ -67,7 +65,7 @@ const dashboardRoutes = [
},
{
path: '/datasets',
component: DatasetDashboardPage,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
title: 'My Dashboard',
......
import DescriptorListDisplayPage from 'descriptorlists/ui/DisplayPage';
import DescriptorListBrowsePage from 'descriptorlists/ui/BrowsePage';
import DescriptorListDashboardPage from 'descriptorlists/ui/DashboardPage';
import DescriptorListStepper from 'descriptorlists/ui/descriptorlist-stepper';
import DescriptorListBasicStep from 'descriptorlists/ui/descriptorlist-stepper/steps/basic-info';
import descriptorListSteps from 'descriptorlists/ui/descriptorlist-stepper/steps';
import DashboardMoved from 'ui/catalog/dashboard/c/DashboardMoved';
import { ROLE_ADMINISTRATOR, ROLE_USER } from 'constants/userRoles';
import Wrapper from 'ui/catalog/Wrapper';
......@@ -38,7 +35,7 @@ const publicRoutes = [
const dashboardRoutes = [
{
path: '/descriptorlists/edit',
component: DescriptorListStepper,
component: DashboardMoved,
exact: true,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
......@@ -47,14 +44,14 @@ const dashboardRoutes = [
routes: [
{
path: '/',
component: DescriptorListBasicStep,
component: DashboardMoved,
exact: true,
},
],
},
{
path: '/descriptorlists/:uuid/',
component: DescriptorListStepper,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
title: 'Descriptor list publisher',
......@@ -65,7 +62,7 @@ const dashboardRoutes = [
},
{
path: '/descriptorlists',
component: DescriptorListDashboardPage,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
title: 'My Dashboard',
......
import DescriptorBrowsePage from 'descriptors/ui/BrowsePage';
import DescriptorDisplayPage from 'descriptors/ui/DisplayPage';
import DescriptorEditPage from 'descriptors/ui/EditPage';
import DescriptorDashboardPage from 'descriptors/ui/DashboardPage';
import DashboardMoved from 'ui/catalog/dashboard/c/DashboardMoved';
import Wrapper from 'ui/catalog/Wrapper';
import { ROLE_ADMINISTRATOR, ROLE_USER } from 'constants/userRoles';
......@@ -33,19 +32,19 @@ const publicRoutes = [
const dashboardRoutes = [
{
path: '/descriptors/edit',
component: DescriptorEditPage,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
exact: true,
},
{
path: '/descriptors/:uuid/edit',
component: DescriptorEditPage,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
exact: true,
},
{
path: '/descriptors',
component: DescriptorDashboardPage,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
title: 'My Dashboard',
......
......@@ -36,6 +36,9 @@
},
"bottomSection": {
"allFields": "* All fields marked with * are required."
},
"dashboardMoved": {
"movedText": "Managing Descriptors, Descriptor lists and Datasets has moved. Please resume your work on the new website"
}
},
"f": {
......
import * as React from 'react';
import { ExternalLink } from 'ui/catalog/Links';
import {translate} from 'react-i18next';
import PageLayout from 'ui/layout/PageLayout';
import Paper from '@material-ui/core/Paper';
import Grid from '@material-ui/core/Grid';
interface IDashboardMovedProps extends React.ClassAttributes<any> {
t: any;
}
class DashboardMoved extends React.Component<IDashboardMovedProps, any> {
public render() {
const { t } = this.props;
console.log(t);
return (
<PageLayout>
<Grid className="p-20">
<Paper className="p-20">
<p className="pb-10">
{ t('dashboard.c.dashboardMoved.movedText') }:
</p>
<ExternalLink link="https://beta.genesys-pgr.org">{ 'https://beta.genesys-pgr.org' }</ExternalLink>
</Paper>
</Grid>
</PageLayout>
);
}
}
export default translate()(DashboardMoved);
......@@ -14,8 +14,8 @@ import {vocabularyAdminRoutes, vocabularyPublicRoutes} from 'vocabulary/routes';
import UserProfilePage from './pages/profile/ProfilePage';
import LoginPage from './pages/login/LoginPage';
import NotFound from './common/not-found';
import DashboardMoved from './catalog/dashboard/c/DashboardMoved';
import {ROLE_ADMINISTRATOR, ROLE_USER} from 'constants/userRoles';
import DatasetDashboardPage from 'datasets/ui/DashboardPage';
const routes = [
{
......@@ -72,7 +72,7 @@ const routes = [
...descriptorDashboardRoutes,
{
path: '/',
component: DatasetDashboardPage,
component: DashboardMoved,
auth: [ROLE_USER, ROLE_ADMINISTRATOR],
extraProps: {
title: 'My Dashboard',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment