Dockerfile + logout redirect to home + vertical roles list in the header

.dockerignore

@@ -0,0 +1,4 @@
+**/node_modules
+node_modules
+.idea/
+.vscode/

.gitlab-ci.yml

@@ -0,0 +1,12 @@
+---
+include:
+  - project: 'kits-maxiv/cfg-maxiv-gitlabci'
+    file: '/Docker.gitlab-ci.yml'
+
+variables:
+  IMAGE_NAME: $CI_PROJECT_NAME
+  DOCKERFILE: "./Dockerfile"
+  DOCKER_REGISTRY_LOGIN: $HARBOR_IMS_ROBOT_USER
+  DOCKER_REGISTRY_PASSWORD: $HARBOR_IMS_ROBOT_PASS
+  MAJOR_TAG: $CI_COMMIT_TAG
+

Dockerfile

@@ -0,0 +1,38 @@
+FROM harbor.maxiv.lu.se/dockerhub/library/node:18-bullseye-slim as build-step
+
+#RUN apk --no-cache add curl
+RUN apt-get -y update; apt-get -y install curl
+
+# set working directory
+#RUN mkdir /usr/app
+WORKDIR /usr/app
+#COPY ./public /usr/app/public
+#COPY ./src /usr/app/src
+COPY ./ /usr/app/
+
+ARG NODE_ENV=development
+ENV NODE_ENV=${NODE_ENV}
+
+# install and cache app dependencies
+#COPY package.json /usr/app/package.json
+#COPY package-lock.json /usr/app/package-lock.json
+RUN npm install -g npm
+RUN npm install
+
+# add `/usr/src/app/node_modules/.bin` to $PATH
+ENV PATH /usr/app/node_modules/.bin:$PATH
+
+ENV REACT_APP_ISPYB_ENV MAXIV
+EXPOSE 3000
+CMD ["npm", "start"]
+
+
+#RUN npm run build --max-old-space-size=4096
+#
+# Deploy container.
+#FROM docker.io/nginxinc/nginx-unprivileged:1-alpine
+#
+#COPY docker/config/default.conf /etc/nginx/conf.d/
+#
+#COPY --from=build-step /usr/app/build/ /usr/share/nginx/html/
+

docker-compose.yml

@@ -0,0 +1,27 @@
+version: "3.6"
+networks:
+  traefik-network:
+    external: true
+
+services:
+  py-ispyb-ui:
+    build:
+      args:
+        - NODE_ENV=development
+      context: .
+    environment:
+      - NODE_ENV=development
+    container_name: py-ispyb-ui
+    labels:
+      - "traefik.backend=py-ispyb-ui-localhost"
+      - "traefik.frontend.rule=Host:py-ispyb-ui.localhost"
+      - "traefik.docker.network=traefik-network"
+      - "traefik.port=3000"
+    volumes:
+      - ./src:/usr/app/src
+      - ./public:/usr/app/public
+    networks:
+      - traefik-network
+    ports:
+      - 5000:5000
+

docker/config/default.conf

@@ -0,0 +1,22 @@
+server {
+    listen       8080;
+    server_name  localhost;
+
+    real_ip_header X-Forwarded-For;
+
+    set_real_ip_from 0.0.0.0/0;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+
+        try_files $uri $uri/ /index.html;
+    }
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}

package.json

@@ -138,4 +138,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

src/components/Auth/Login/LoginJava.tsx

@@ -96,7 +96,7 @@ export default function LoginJava() {
               </Row>
             )}
             <Form.Group as={Row} className="mb-2">
-              <Form.Label column>Username JAVA</Form.Label>
+              <Form.Label column>Username</Form.Label>
               <Col md={12} lg={8}>
                 <Form.Control
                   type="text"

src/components/Header.tsx

@@ -1,5 +1,5 @@
 import { Suspense } from 'react';
-import { Link, NavLink, Outlet } from 'react-router-dom';
+import { Link, NavLink, Outlet, useNavigate } from 'react-router-dom';
 import { useController } from 'rest-hooks';
 import { Navbar, NavDropdown, Container, Nav, Button } from 'react-bootstrap';
 import { PersonBadge } from 'react-bootstrap-icons';
@@ -13,6 +13,8 @@ import { ActiveProposal } from './ActiveProposal';
 import { Footer } from './Footer';
 import Loading from './Loading';
 
+
+
 function PersonMenu() {
   const currentUser = useCurrentUser();
   return (
@@ -38,11 +40,14 @@ function PersonMenu() {
 export function Logout() {
   const { clearToken } = useAuth();
   const { resetEntireStore } = useController();
+  const navigate = useNavigate();
+
   return (
     <Button
       onClick={() => {
         clearToken();
         resetEntireStore();
+        navigate("/");
       }}
     >
       Logout

src/config/config.ts

@@ -1,5 +1,6 @@
 import { DEFAULT } from './default';
 import { ESRF } from './esrf';
+import { MAXIV } from './maxiv';
 import { NETLIFY } from './netlify';
 
 const ISPYB_ENV = process.env.REACT_APP_ISPYB_ENV;
@@ -8,6 +9,7 @@ console.log(ISPYB_ENV);
 const getSitesConfig = () => {
   if (ISPYB_ENV === undefined) return DEFAULT;
   if (ISPYB_ENV.toLowerCase().includes('esrf')) return ESRF;
+  if (ISPYB_ENV.toLowerCase().includes('maxiv')) return MAXIV;
   if (ISPYB_ENV.toLowerCase().includes('netlify')) return NETLIFY;
   return DEFAULT;
 };

src/config/maxiv.ts

@@ -0,0 +1,22 @@
+import { SiteConfig } from 'config/definitions/sites';
+
+export const MAXIV: SiteConfig[] = [
+  {
+    name: 'MAXIV-java',
+    description: 'For MX/EM',
+    javaName: 'MAXIV',
+    host: 'https://ispyb.maxiv.lu.se',
+    apiPrefix: '/ispyb/ispyb-ws/rest',
+    javaMode: true,
+    javaConfig: {
+      techniques: {
+        MX: {
+          beamlines: [
+            { name: 'BioMAX', sampleChangerType: 'FlexHCDDual' },
+            { name: 'MicroMAX', sampleChangerType: 'FlexHCDUnipuckPlate' },
+          ],
+        },
+      },
+    },
+  },
+];

src/legacy/components/Header.tsx

@@ -4,6 +4,7 @@ import { useAuth } from 'hooks/useAuth';
 import { NavLink } from 'react-router-dom';
 
 export function JavaHeader() {
+
   return (
     <>
       <Navbar.Toggle aria-controls="main-navbar" />
@@ -19,6 +20,7 @@ export function JavaHeader() {
 
         <Nav>
           <PersonMenu />
+          <Logout/>
         </Nav>
       </Navbar.Collapse>
     </>
@@ -38,6 +40,7 @@ function PersonMenu() {
       id="admin-nav-dropdown"
       align="end"
     >
+      <NavDropdown.Header><div className='new-line'>{javaPerson?.roles.join('\n\r')}</div></NavDropdown.Header>
       <Logout />
       <NavDropdown.ItemText>
         <small

src/scss/_general.scss

@@ -91,3 +91,4 @@ html {
 #pageDropDown {
   background-color: $pagination !important;
 }
+