Merge pull request #286 from os2display/release/2.5.0

Release/2.5.0

Author: tuj

.eslintrc

@@ -1,5 +1,5 @@
 {
-  "plugins": ["react", "prettier", "only-warn"],
+  "plugins": ["react", "prettier"],
   "extends": [
     "airbnb",
     "prettier",
@@ -18,7 +18,9 @@
     "allowImportExportEverywhere": true
   },
   "rules": {
+    "react/react-in-jsx-scope": "off",
     "react/require-default-props": "off",
+     "react/prop-types": "off",
     "react/jsx-filename-extension": [
       "warn",
       {

CHANGELOG.md

@@ -1,10 +1,27 @@
-
 # Changelog
 
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.5.0] - 2025-05-09
+
+- [#285](https://github.com/os2display/display-admin-client/pull/285)
+  - Rewrite screen playlists get to use promises
+  - Fix save screen and go to list
+  - Disable eslint for proptypes
+  - Disable eslint for react in scope
+- [#284](https://github.com/os2display/display-admin-client/pull/284)
+  - Fixed spacer calculations for previews.
+  - Added border to preview container
+- [#283](https://github.com/os2display/display-admin-client/pull/283)
+  - Fixed preview issues. 
+- [#275](https://github.com/os2display/display-admin-client/pull/275)
+  - Added enhanced preview.
+- [#276](https://github.com/os2display/display-admin-client/pull/276)
+  - Added Colibo feed type form.
+  - Fixed feed type selector when unsupported type.
+
 ## [2.4.0] - 2025-03-31
 
 - [#281](https://github.com/os2display/display-admin-client/pull/281)

README.md

@@ -32,15 +32,10 @@ setting are required than what is default.
 cp public/example-access-config.json public/access-config.json
 ```
 
-### Up the containers
+### Up the containers and install npm packages
 
 ```shell
 docker compose up --detach
-```
-
-### Install npm packages
-
-```shell
 docker compose run --rm node yarn install
 ```
 

e2e/feed-sources.spec.js

@@ -219,7 +219,7 @@ test.describe("fest", () => {
 
   test("It loads create datakilde page", async ({ page }) => {
     page.getByText("Opret ny datakilde").click();
-    await expect(page.locator("#save_feed-source")).toBeVisible();
+    await expect(page.locator("#save")).toBeVisible();
   });
 
   test("It display error toast on save error", async ({ page }) => {
@@ -238,7 +238,7 @@ test.describe("fest", () => {
     await expect(
       page.locator(".Toastify").locator(".Toastify__toast--error")
     ).not.toBeVisible();
-    await page.locator("#save_feed-source").click();
+    await page.locator("#save").click();
     await expect(
       page.locator(".Toastify").locator(".Toastify__toast--error")
     ).toBeVisible();
@@ -253,9 +253,9 @@ test.describe("fest", () => {
   });
   test("Cancel create datakilde", async ({ page }) => {
     page.getByText("Opret ny datakilde").click();
-    await expect(page.locator("#cancel_feed-source")).toBeVisible();
-    await page.locator("#cancel_feed-source").click();
-    await expect(page.locator("#cancel_feed-source")).not.toBeVisible();
+    await expect(page.locator("#cancel")).toBeVisible();
+    await page.locator("#cancel").click();
+    await expect(page.locator("#cancel")).not.toBeVisible();
   });
 });
 

e2e/playlist.spec.js

@@ -59,7 +59,7 @@ test.describe("Playlist create tests", () => {
     await expect(
       page.locator(".Toastify").locator(".Toastify__toast--success")
     ).not.toBeVisible();
-    await page.locator("#save_playlist").click();
+    await page.locator("#save_slide_and_close").click();
     await expect(
       page
         .locator(".Toastify")

infrastructure/itkdev/etc/confd/templates/config.tmpl

@@ -1,6 +1,7 @@
 {
   "api": "{{ getenv "API_PATH" "/" }}",
   "touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}",
+  "previewClient": "{{ getenv "APP_PREVIEW_CLIENT" "null"}}",
   "showScreenStatus": "{{ getenv "APP_SHOW_SCREEN_STATUS" "true"}}",
   "rejseplanenApiKey": "{{ getenv "APP_REJSEPLANEN_API_KEY" "null"}}",
   "loginMethods": [

infrastructure/os2display/etc/confd/templates/config.tmpl

@@ -1,6 +1,7 @@
 {
   "api": "{{ getenv "API_PATH" "/" }}",
   "touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}",
+  "previewClient": "{{ getenv "APP_PREVIEW_CLIENT" "null"}}",
   "showScreenStatus": "{{ getenv "APP_SHOW_SCREEN_STATUS" "false"}}",
   "rejseplanenApiKey": "{{ getenv "APP_REJSEPLANEN_API_KEY" "null"}}",
   "loginMethods": [

package.json

@@ -89,7 +89,6 @@
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-jsdoc": "^35.4.3",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-only-warn": "^1.0.2",
     "eslint-plugin-prettier": "3.4.0",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.2.0",

public/example_config.json

@@ -1,6 +1,7 @@
 {
   "api": "/",
   "touchButtonRegions": false,
+  "previewClient": null,
   "showScreenStatus": false,
   "rejseplanenApiKey": null,
   "loginMethods": [

src/app.jsx

@@ -220,7 +220,7 @@ function App() {
                       <Col lg={9} xl={10}>
                         <Topbar />
                         {accessConfig && (
-                          <main className="col p-3">
+                          <main>
                             <Routes>
                               <Route path="campaign">
                                 <Route