Skip to content

Fix requests #451

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.

Sign up for GitHub

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

Open
SystemsPurge wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Fix requests #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
10efea1
Refactor PlayerWidget into a functional component
SystemsPurge Oct 23, 2024
a384147
fix: status widget and player widget
SystemsPurge Oct 24, 2024
9c0d5c2
Update modal for the ICs creation
Anyandsi Nov 13, 2024
16de70a
Add error boundary to the dashboard and start refactoring
Anyandsi Dec 3, 2024
c206ae0
Change widget context menu into a functional component
Anyandsi Jan 16, 2025
4e3ce18
Update refactored widget behavior
Anyandsi Jan 22, 2025
7ccf44b
Fix wrong ic modal type/category filtration
Anyandsi Apr 9, 2025
f8346d7
add error boundary to the dashboard refactor widgets and dashboard co…
Anyandsi Dec 3, 2024
cad50bb
transfer dashboard and widgets changes to a new branch
Anyandsi Apr 8, 2025
fb4ea52
Update Button Widget
Anyandsi Apr 17, 2025
aa24c1f
fix: replace hard coded URL, consider dev case (proxy != window.locat…
SystemsPurge Nov 6, 2025
847e7a9
fix: remove old unused code
SystemsPurge Nov 6, 2025
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
24 changes: 24 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@ build.opalrt:
DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
extends: build

build.kopernikus:
variables:
BRANDING: kopernikus
DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
extends: build

build.enershare:
variables:
BRANDING: enershare
DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
extends: build

deploy:
stage: deploy
variables:
Expand All @@ -56,6 +68,18 @@ deploy.opalrt:
BRANDING: opalrt
DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}

deploy.kopernikus:
extends: deploy
variables:
BRANDING: kopernikus
DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}

deploy.enershare:
variables:
BRANDING: enershare
DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
extends: deploy

deploy.latest:
extends: deploy
variables:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"proxy": "https://villas.k8s.eonerc.rwth-aachen.de",
"proxy": "https://villas.k8s.eonerc.rwth-aachen.de/",
"browserslist": {
"production": [
">0.2%",
Expand Down
189 changes: 113 additions & 76 deletions src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,102 +15,139 @@
* along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/

import React from 'react';
import { DndProvider } from 'react-dnd';
import { HTML5Backend }from 'react-dnd-html5-backend';
import NotificationSystem from 'react-notification-system';
import { Redirect, Route } from 'react-router-dom';
import jwt from 'jsonwebtoken';
import NotificationsDataManager from './common/data-managers/notifications-data-manager';
import Home from './common/home';
import Header from './common/header';
import Menu from './common/menu';
import InfrastructureComponent from './pages/infrastructure/ic';
import Scenarios from './pages/scenarios/scenarios';
import APIBrowser from './common/api-browser';
import Scenario from './pages/scenarios/scenario';
import Users from './pages/users/users';
import Dashboard from './pages/dashboards/dashboard';
import Account from './pages/account/account';
import './styles/app.css';
import './styles/login.css';
import branding from './branding/branding';
import Logout from './pages/login/logout';
import Infrastructure from './pages/infrastructure/infrastructure';
import { useSelector } from 'react-redux';
import React from "react";
import { useRef, useEffect } from "react";
import { DndProvider } from "react-dnd";
import { HTML5Backend } from "react-dnd-html5-backend";
import NotificationSystem from "react-notification-system";
import { Redirect, Route } from "react-router-dom";
import jwt from "jsonwebtoken";
import NotificationsDataManager from "./common/data-managers/notifications-data-manager";
import Home from "./common/home";
import Header from "./common/header";
import Menu from "./common/menu";
import InfrastructureComponent from "./pages/infrastructure/ic";
import Scenarios from "./pages/scenarios/scenarios";
import APIBrowser from "./common/api-browser";
import Scenario from "./pages/scenarios/scenario";
import Users from "./pages/users/users";
import Dashboard from "./pages/dashboards/dashboard.jsx";
import Account from "./pages/account/account";
import "./styles/app.css";
import "./styles/login.css";
import branding from "./branding/branding";
import Logout from "./pages/login/logout";
import Infrastructure from "./pages/infrastructure/infrastructure";
import Usergroup from "./pages/usergroups/usergroup";
import { useSelector } from "react-redux";
import DashboardErrorBoundary from "./pages/dashboards/dashboard-error-boundry";

const App = () => {

const isTokenExpired = (token) => {
let decodedToken = jwt.decode(token);
let timeNow = (new Date().getTime() + 1) / 1000;
return decodedToken.exp < timeNow;
}
};

const notificationSystem = useRef(null);

useEffect(() => {
NotificationsDataManager.setSystem(notificationSystem.current);

return () => {
NotificationsDataManager.setSystem(null);
};
}, []);

const { isAuthenticated, token, user } = useSelector((state) => state.auth);

if (!isAuthenticated || isTokenExpired(token)) {
console.log("APP redirecting to logout/login");
return (<Redirect to="/logout" />);
return <Redirect to="/logout" />;
} else {

console.log("APP rendering app");
const pages = branding.values.pages;

return (<DndProvider backend={HTML5Backend} >
<div className="app">
<NotificationSystem />
<Header />
return (
<DndProvider backend={HTML5Backend}>
<div className="app">
<NotificationSystem ref={notificationSystem} />
<Header />

<div className='app-body app-body-spacing'>
<Menu currentRole={user.role} />
<div className="app-body app-body-spacing">
<Menu currentRole={user.role} />

<div className='app-content app-content-margin-left'>
<Route exact path="/" component={Home} />
{ pages.home ? <Route path="/home" component={Home} /> : '' }
{ pages.scenarios ? <>
<Route exact path="/scenarios">
<Scenarios />
</Route>
<Route exact path="/logout">
<Logout />
</Route>
<Route path="/scenarios/:scenario">
<Scenario />
</Route>
<Route path="/dashboards/:dashboard">
<Dashboard />
</Route>
<Route path="/dashboards-new/:dashboard">
<Dashboard />
</Route>
</>
: '' }
{ user.role === "Admin" || pages.infrastructure ? <>
<Route exact path="/infrastructure">
<Infrastructure />
</Route>
<Route path="/infrastructure/:ic">
<InfrastructureComponent />
</Route>
</>
: '' }
{ pages.account ? <Route path="/account"><Account /></Route> : '' }
{ user.role === "Admin" ?
<Route path="/users">
<Users />
</Route>
: '' }
{ user.role === "Admin" || pages.api ?
<Route path="/api" component={APIBrowser} />
: '' }
<div className="app-content app-content-margin-left">
<Route exact path="/" component={Home} />
{pages.home ? <Route path="/home" component={Home} /> : ""}
{pages.scenarios ? (
<>
<Route exact path="/scenarios">
<Scenarios />
</Route>
<Route exact path="/logout">
<Logout />
</Route>
<Route path="/scenarios/:scenario">
<Scenario />
</Route>
<Route path="/dashboards/:dashboard">
<DashboardErrorBoundary>
<Dashboard />
</DashboardErrorBoundary>
</Route>
<Route path="/dashboards-new/:dashboard">
<Dashboard />
</Route>
</>
) : (
""
)}
{user.role === "Admin" || pages.infrastructure ? (
<>
<Route exact path="/infrastructure">
<Infrastructure />
</Route>
<Route path="/infrastructure/:ic">
<InfrastructureComponent />
</Route>
</>
) : (
""
)}
{pages.account ? (
<Route path="/account">
<Account />
</Route>
) : (
""
)}
{user.role === "Admin" ? (
<>
<Route path="/users">
<Users />
</Route>
<Route path="/usergroup/:usergroup">
<Usergroup />
</Route>
</>
) : (
""
)}
{user.role === "Admin" || pages.api ? (
<Route path="/api" component={APIBrowser} />
) : (
""
)}
</div>
</div>
</div>

{branding.getFooter()}
</div>
</DndProvider>)
{branding.getFooter()}
</div>
</DndProvider>
);
}
}
};

export default App;
Loading