3068: Fixed merge

Author: tuj

.docker/vhost.conf

@@ -7,7 +7,16 @@ server {
         proxy_set_header   X-Forwarded-For $remote_addr;
         proxy_set_header   Host $http_host;
         proxy_pass         http://node:3000;
-        add_header         Cache-Control "public, max-age=604800";
-        expires            7d;
+
+        add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+        add_header Pragma "no-cache";
+        add_header Expires "0";
+    }
+
+    location /client/ws {
+        proxy_pass http://node:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
     }
 }

.editorconfig

@@ -8,7 +8,7 @@ end_of_line = LF
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{php,html,twig,js,css,scss,json,yaml}]
+[*.{php,html,twig,js,css,scss,json,yaml,jsx}]
 indent_style = space
 indent_size = 2
 

.eslintrc.json

@@ -14,6 +14,7 @@
     "allowImportExportEverywhere": true
   },
   "rules": {
+    "react/require-default-props": "off",
     "react/jsx-filename-extension": [
       "warn",
       {

.github/workflows/pr.yml

@@ -53,7 +53,7 @@ jobs:
 
       - name: Archive screenshots
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: cypress-screenshots-${{ matrix.browser }}
           path: cypress/screenshots

CHANGELOG.md

@@ -5,6 +5,51 @@ All notable changes to this project will be documented in this file.
 ## Unreleased
 
 - Added support for previews.
+- [#140](https://github.com/os2display/display-client/pull/140)
+  - Fixed issue where campaign end resulted in blank screen.
+
+## [2.1.1] - 2024-10-23
+
+- [#138](https://github.com/os2display/display-client/pull/138)
+  - Avoided setting ER105 in url when no token exists in local storage.
+- [#137](https://github.com/os2display/display-client/pull/137)
+  - Add `no-cache´ directive to nginx setup.
+
+## [2.1.0] - 2024-10-23
+
+- [#135](https://github.com/os2display/display-client/pull/135)
+  - Fixed cursor being hidden when not in debug mode.
+  - Moved registration of listeners in useEffect.
+- [#134](https://github.com/os2display/display-client/pull/134)
+  - Fixed remote loader for touch regions.
+- [#133](https://github.com/os2display/display-client/pull/133)
+  - Added error message ER201 on screen when remote component could not load.
+  - Added error timestamp to remote component loader, to force reload on error.
+- [#132](https://github.com/os2display/display-client/pull/132)
+  - Remove token errors after re-login.
+- [#131](https://github.com/os2display/display-client/pull/131)
+  - Moved localstorage calls into helper class AppStorage.
+  - Cleaned up project structure.
+  - Fixed async flow for release check.
+  - Added previous boot timestamp (pb) to url.
+  - Try to refresh token on reauthenticate event.
+  - Added status and error to url.
+  - Added error code to login page, if set.
+- [#130](https://github.com/os2display/display-client/pull/130)
+  - Fixed issue with svg loading.
+- [#127](https://github.com/os2display/display-client/pull/127)
+  - Migrate from CRA to Vite
+  - Upgrade node from 14 -> 20
+  - Winston logging to Pino logging
+  - Set infrastructure node version to 20.
+  - Fixed base path to /client.
+- [#118](https://github.com/os2display/display-client/pull/118)
+  - Added api url to localstorage.
+
+## [2.0.4] - 2024-08-14
+
+- [#128](https://github.com/os2display/display-client/pull/128)
+  - Fixed rrule evaluation to handle local time correctly.
 
 ## [2.0.3] - 2024-05-21
 
@@ -34,7 +79,8 @@ All notable changes to this project will be documented in this file.
 
 - [#119](https://github.com/os2display/display-client/pull/119)
   - Changed to v2 routing.
-- Limited the number of API calls by comparing relationsChecksum.
+- [#117](https://github.com/os2display/display-client/pull/117)
+  - Limited the number of API calls by comparing relationsChecksum.
 
 ## [1.3.5] - 2023-09-14
 

README.md

@@ -50,7 +50,7 @@ Start docker setup
 
 ```
 # Install npm packages
-docker compose run node yarn install
+docker compose run --rm node yarn install
 
 # Up the containers
 docker compose up -d

docker-compose.yml

@@ -29,7 +29,7 @@ services:
       - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
 
   node:
-    image: node:14
+    image: node:20
     command: yarn start
     networks:
       - app

docs/error-codes.md

@@ -0,0 +1,9 @@
+# Error codes
+
+* ER101: API returns 401. Token could not be refreshed. This could be caused by logging out in the admin.
+* ER102: Token could not be refreshed in normal refresh token loop.
+* ER103: Token refresh aborted, refresh token, iat and/or exp not set.
+* ER104: Release file could not be loaded.
+* ER105: Token is expired.
+* ER106: Token is valid but should have been refreshed.
+* ER201: Error loading slide template.

public/index.html renamed to index.html

@@ -2,28 +2,15 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta name="google" content="notranslate" />
     <meta
       name="description"
       content="OS2Display client"
     />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
+    <link rel="manifest" href="/manifest.json" />
     <title>OS2Display</title>
   </head>
   <body>
@@ -39,5 +26,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
+    <script type="module" src="/src/index.jsx"></script>
   </body>
 </html>

infrastructure/itkdev/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16 AS APP_BUILDER
+FROM node:20 AS APP_BUILDER
 LABEL maintainer="ITK Dev <[email protected]>"
 
 ARG APP_VERSION="develop"