Skip to content

Commit a1a3f75

Browse files
committed
4565: Fixed issues raised by ci
1 parent 9faf049 commit a1a3f75

File tree

19 files changed

+169
-158
lines changed

19 files changed

+169
-158
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
66

77
* Gathered all repositories in one Symfony application.
88

9-
#### NB! Prior to 3.x the project was split into separate repositories.
9+
### NB! Prior to 3.x the project was split into separate repositories
1010

1111
Therefore, changelogs were maintained for each repo. These are available here:
1212

assets/admin/redux/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
The Redux setup is built with Redux Toolkit and RTK Query for communicating with the api.
44

5-
The api integration is generated with https://github.com/rtk-incubator/rtk-query-codegen.
5+
The api integration is generated with <https://github.com/rtk-incubator/rtk-query-codegen>.
66

77
The folder `src/redux/api` contains the latest generated ApiSlice and a node setup for generating a new ApiSlice:
8-
```
8+
9+
```shell
910
# Override api.json with new OpenAPI specification.
1011

1112
npm install

config/bundles.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
return [
46
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
57
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],

docs/adr/002-api-first.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Written years after the decision was made.
1111
## Context
1212

1313
The "API first" approach is to enforce that all interactions with the system must go through the API.
14-
See more about the "API first" approach [here](https://swagger.io/resources/articles/adopting-an-api-first-approach/).
14+
See more about the "API first" approach here: [https://swagger.io/resources/articles/adopting-an-api-first-approach/](https://swagger.io/resources/articles/adopting-an-api-first-approach/).
1515

1616
The previous version of OS2Display was used without the admin module in some contexts.
1717
We want to support other uses than the standard OS2Display setup.

docs/changelogs/admin.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file.
1818
- Fixed spacer calculations for previews.
1919
- Added border to preview container
2020
- [#283](https://github.com/os2display/display-admin-client/pull/283)
21-
- Fixed preview issues.
21+
- Fixed preview issues.
2222
- [#275](https://github.com/os2display/display-admin-client/pull/275)
2323
- Added enhanced preview.
2424
- [#276](https://github.com/os2display/display-admin-client/pull/276)
@@ -64,16 +64,16 @@ All notable changes to this project will be documented in this file.
6464
- [#263](https://github.com/os2display/display-admin-client/pull/263)
6565
- Added prefix to local storage keys.
6666
- [#262](https://github.com/os2display/display-admin-client/pull/262)
67-
- Add multi select styling for `invalid` state
67+
- Add multi select styling for `invalid` state
6868
- Add possibility of sending error via props to multiselect component
6969
- Add validation checking if layout is selected on screen before save
7070
- Add validation checking if template is selected on slide before save
7171
- [#260](https://github.com/os2display/display-admin-client/pull/260)
72-
- Bug in multiselect, fixed by removing duplicates by key both `@id`and `id`
72+
- Bug in multiselect, fixed by removing duplicates by key both `@id`and `id`
7373
- [#259](https://github.com/os2display/display-admin-client/pull/259)
7474
- Add saving of playlists/groups with screen (as opposed to _after_)
7575
- Clean up `screen-manager.jsx`
76-
- Change bootstrap column class from `col-md-8` -> `col-md-12`
76+
- Change bootstrap column class from `col-md-8` -> `col-md-12`
7777
- update api.generated.ts to match [related pr](https://github.com/os2display/display-api-service/pull/213)
7878
- Add @rtk-incubator/rtk-query-codegen-openapi to package.json in `src/redux/api`
7979
- Sort playlists based on weight in drag/drop component
@@ -112,7 +112,9 @@ All notable changes to this project will be documented in this file.
112112
## [2.0.3] - 2024-08-14
113113

114114
- [#252](https://github.com/os2display/display-admin-client/pull/252)
115-
- Reverted change in https://github.com/os2display/display-admin-client/commit/65762066c708f541305a48fbd6b28264dca593b5 regarding rrule dtstart.
115+
- Reverted change in
116+
<https://github.com/os2display/display-admin-client/commit/65762066c708f541305a48fbd6b28264dca593b5> regarding rrule
117+
dtstart.
116118
- Added comments about how rrules are handled.
117119
- [#242](https://github.com/os2display/display-admin-client/pull/243)
118120
- Add entry in example config for midttrafik api key
@@ -137,7 +139,7 @@ All notable changes to this project will be documented in this file.
137139
- [#240](https://github.com/os2display/display-admin-client/pull/240)
138140
- Remove caching of requests from redux toolkit api.
139141
- [#239](https://github.com/os2display/display-admin-client/pull/239)
140-
- Updated api integration following route change to v2.
142+
- Updated api integration following route change to v2.
141143
- [#238](https://github.com/os2display/display-admin-client/pull/238)
142144
- Fixed screen layout overlapping issue.
143145
- [#237](https://github.com/os2display/display-admin-client/pull/237)

docs/changelogs/client.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ All notable changes to this project will be documented in this file.
6161

6262
- [#125](https://github.com/os2display/display-client/pull/125)
6363
- Removed React strict mode.
64-
- Added null check to release query parameter changes, to avoid redirecting to ?releaseVersion=null&releaseTimestamp=null when release.json cannot be reached (eg. when the internet connection is down).
64+
- Added null check to release query parameter changes, to avoid redirecting to
65+
?releaseVersion=null&releaseTimestamp=null when release.json cannot be reached (eg. when the internet connection is
66+
down).
6567

6668
## [2.0.2] - 2024-04-25
6769

@@ -118,7 +120,8 @@ All notable changes to this project will be documented in this file.
118120
- [#108](https://github.com/os2display/display-client/pull/108)
119121
Only slides with a loaded template should be rendered.
120122
- [#109](https://github.com/os2display/display-client/pull/109)
121-
Change docker image name from `os2display/os2display-client` to `os2display/display-client` to match image name and repository name
123+
Change docker image name from `os2display/os2display-client` to `os2display/display-client` to match image name and
124+
repository name
122125
- [#110](https://github.com/os2display/display-client/pull/110)
123126
Setup separate image builds for itkdev and os2display
124127

0 commit comments

Comments
 (0)