Merge branch 'release/2.1.0'

Author: turegjorup

vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

.docker/vhost.conf

@@ -8,4 +8,11 @@ server {
         proxy_set_header   Host $http_host;
         proxy_pass         http://node:3000;
     }
+
+    location /admin/ws {
+        proxy_pass http://node:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
 }

.eslintrc

@@ -4,8 +4,7 @@
     "airbnb",
     "prettier",
     "plugin:jsdoc/recommended",
-    "plugin:prettier/recommended",
-    "plugin:cypress/recommended"
+    "plugin:prettier/recommended"
   ],
   "ignorePatterns": ["*.yml"],
   "parser": "babel-eslint",
@@ -14,6 +13,7 @@
     "allowImportExportEverywhere": true
   },
   "rules": {
+    "react/require-default-props": "off",
     "react/jsx-filename-extension": [
       "warn",
       {

.github/workflows/pr.yml

@@ -31,13 +31,11 @@ jobs:
           docker compose run --rm node yarn install
           docker compose run --rm node yarn check-coding-standards
 
-  cypress:
-    name: Cypress
+  playwright-tests:
+    name: Playwright
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        browser: ["chrome"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -48,16 +46,21 @@ jobs:
       - name: Install client
         run: docker compose run node yarn
 
-      - name: Cypress run
-        run: docker compose run cypress run --browser ${{ matrix.browser }}
+      - name: Run playwright
+        env:
+          CI: 'true'
+        run: |
+          docker compose run --rm node yarn install
+          docker compose run --rm playwright npx playwright install --with-deps
+          docker compose run --rm playwright npx playwright test --retries 3
+
 
-      - name: Archive screenshots
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
+        if: always()
         with:
-          name: cypress-screenshots-${{ matrix.browser }}
-          path: cypress/screenshots
-          retention-days: 7
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30
 
   changelog:
     runs-on: ubuntu-latest

.gitignore

@@ -25,16 +25,16 @@ yarn-error.log*
 # Ignore VS-code
 .vscode
 
-# Cypress
-cypress/videos/*
-cypress/screenshots/*
-
 # Temp files
 temp/
 
-# API mock
-json-server/
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
 
+# Json files in public folder
 public/config.json
 public/access-config.json
 public/release.json

CHANGELOG.md

@@ -1,9 +1,41 @@
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.1.0] - 2024-10-23
+
+- [#258](https://github.com/os2display/display-admin-client/pull/258)
+  - Fixed screen is vertical check.
+- [#257](https://github.com/os2display/display-admin-client/pull/257)
+  - Update multiselect component
+  - Change key in function from `id` to `@id`
+- [#256](https://github.com/os2display/display-admin-client/pull/256)
+  - Fixed published from/to texts.
+- [#255](https://github.com/os2display/display-admin-client/pull/255)
+  - Fixed rejseplanen component so it does not throw errors when searching for stops.
+- [#254](https://github.com/os2display/display-admin-client/pull/254)
+  - Changed playlist.slides list columns.
+  - Set published.to to now when creating new slides.
+  - Added option to sort slides in playlist by published.to and status.
+- [#253](https://github.com/os2display/display-admin-client/pull/253)
+  - Refactored scheduling to increase user experience.
+  - Added interval and count to rrule inputs.
+- [#249](https://github.com/os2display/display-admin-client/pull/249)
+  - Set infrastructure node version to 20.
+  - Fixed base path to /admin in vite setup.
+  - Changed from vite CJS to ESM.
+  - Removed array spread.
+  - Fixed HMR setup.
+  - Upgraded @fortawesome/react-fontawesome, react-quill, react-toastify.
+  - Removed unused react-dayjs.
+  - Remove default props from the project.
+  - Migrate from Cypress to playwright
+  - Migrate from CRA to Vite
+  - Upgrade node from 14 -> 20
+
 ## [2.0.3] - 2024-08-14
 
 - [#252](https://github.com/os2display/display-admin-client/pull/252)

README.md

@@ -8,7 +8,7 @@ description of the admin.
 
 ### Create public/config file
 
-By default the api that is requested is located at `/api/`.
+By default, the api that is requested is located at `/api/`.
 This can be configured by:
 
 ```shell
@@ -62,14 +62,20 @@ docker compose exec node npm --prefix src/redux/api install
 docker compose exec node npm --prefix src/redux/api start
 ```
 
-## Testing with cypress
+## Testing with playwright
 
-We use [cypress](https://www.cypress.io/) for testing.
+We use [playwright](https://playwright.dev/) for testing.
 
-To run cypress tests in the cypress container:
+To run playwright tests with docker:
 
 ```shell
-docker compose run --rm cypress run
+ docker compose run --rm playwright npx playwright test
+```
+
+To test with user interface, up the containers and change the baseUrl in playwright.config.ts, then: 
+
+```shell
+yarn playwright test --ui 
 ```
 
 ### Linting