Skip to content

Commit

Permalink
Merge pull request #239 from aroskanalen/feature/398-route-v2
Browse files Browse the repository at this point in the history
398: Changed to v2 routing
  • Loading branch information
tuj authored Apr 3, 2024
2 parents 990a38d + cf35a3c commit 013d299
Show file tree
Hide file tree
Showing 71 changed files with 3,582 additions and 2,380 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

- [#239](https://github.com/os2display/display-admin-client/pull/239)
- Updated api integration following route change to v2.
- [#238](https://github.com/os2display/display-admin-client/pull/238)
- Fixed screen layout overlapping issue.
- [#237](https://github.com/os2display/display-admin-client/pull/237)
Expand Down
2 changes: 1 addition & 1 deletion cypress/fixtures/groups/group-successful.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"createdBy": "ScreenGroup/createdBy"
},
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/00KXGYAJ4A1D5P0EA11SKF0BG8",
"@id": "/v2/screen-groups/00KXGYAJ4A1D5P0EA11SKF0BG8",
"title": "A laudantium aspernatur qui.",
"description": "Non fugiat nobis occaecati. Sed ut velit beatae amet ea esse. Quo dolorem commodi magni at. Illum voluptatem neque nobis et ut. Ad rerum tempore vel commodi suscipit corrupti.",
"created": "1991-09-10T22:36:56+02:00",
Expand Down
32 changes: 16 additions & 16 deletions cypress/fixtures/groups/groups.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"@context": "/contexts/ScreenGroup",
"@id": "/v1/screen-groups",
"@id": "/v2/screen-groups",
"@type": "hydra:Collection",
"hydra:member": [
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/000RAH746Q1AD8011Z1JNV06N3",
"@id": "/v2/screen-groups/000RAH746Q1AD8011Z1JNV06N3",
"title": "Cupiditate et quidem autem iusto.",
"description": "Eos quibusdam consectetur nisi consequatur voluptas. Unde maxime sunt quidem magnam. Sed ipsa voluptas qui occaecati ea nobis.",
"created": "1970-10-30T08:30:07+01:00",
Expand All @@ -15,7 +15,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/0012G98YZS0VTK0Z2T02AD1DC3",
"@id": "/v2/screen-groups/0012G98YZS0VTK0Z2T02AD1DC3",
"title": "Dignissimos nihil non sit laudantium.",
"description": "Maxime dicta magnam est voluptas voluptas. Est omnis expedita harum reprehenderit debitis laboriosam ab omnis. Sed temporibus iste voluptatibus ut qui est non voluptatem.",
"created": "1971-03-05T20:43:43+01:00",
Expand All @@ -25,7 +25,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/001EZQXKKR0P7X0A3119Z016SB",
"@id": "/v2/screen-groups/001EZQXKKR0P7X0A3119Z016SB",
"title": "Aut nam accusantium id aut.",
"description": "Et est nisi autem nihil. Blanditiis facere repellat et. Est et architecto modi laboriosam corporis et.",
"created": "1971-08-07T23:56:38+01:00",
Expand All @@ -35,7 +35,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/003J350X2D060H00TE1DW50640",
"@id": "/v2/screen-groups/003J350X2D060H00TE1DW50640",
"title": "Velit rem commodi necessitatibus eos.",
"description": "Non sequi sed fugit. Nihil cumque nesciunt hic recusandae rem suscipit sunt. Nostrum voluptatem ut consequatur non illum.",
"created": "1973-11-18T23:15:03+01:00",
Expand All @@ -45,7 +45,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/003Z784JQS1PNS1RX1003N0NCD",
"@id": "/v2/screen-groups/003Z784JQS1PNS1RX1003N0NCD",
"title": "Quod esse voluptas ut.",
"description": "Deleniti velit est quasi commodi alias est minima. Harum iusto odio aperiam consequatur qui est. Vel ut id aperiam nobis fugiat et modi. Est dolores rerum id sed excepturi et.",
"created": "1974-05-01T02:50:31+01:00",
Expand All @@ -55,7 +55,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/009YS5ZYPH1B9T0JE01S290T5Y",
"@id": "/v2/screen-groups/009YS5ZYPH1B9T0JE01S290T5Y",
"title": "Tenetur voluptatem quo rerum exercitationem.",
"description": "Suscipit provident odit in eius sed voluptatibus. Neque aut corporis aspernatur quo qui. Inventore nam est sed sed maiores odio.",
"created": "1980-11-05T17:57:30+01:00",
Expand All @@ -65,7 +65,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/00C1V1MX2S02N30EXM163A0E6X",
"@id": "/v2/screen-groups/00C1V2MX2S02N30EXM163A0E6X",
"title": "Distinctio quisquam et totam molestias.",
"description": "Ad ipsam architecto eum repellat excepturi. Quos deleniti itaque ut reprehenderit aut rerum autem. Nihil et mollitia voluptatibus quis voluptatem. Ex eaque sint nostrum impedit.",
"created": "1983-02-17T02:51:45+01:00",
Expand All @@ -75,7 +75,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/00DDTCJCDX0H101N480E180K4B",
"@id": "/v2/screen-groups/00DDTCJCDX0H101N480E180K4B",
"title": "Cumque facere nulla reiciendis.",
"description": "Veritatis doloremque delectus voluptas numquam dolores nobis. Dignissimos quo facere eum iure.",
"created": "1984-08-16T16:14:03+02:00",
Expand All @@ -85,7 +85,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/00GEPM6JRX0V2P0YST0JHA03CC",
"@id": "/v2/screen-groups/00GEPM6JRX0V2P0YST0JHA03CC",
"title": "Ea aspernatur odit rerum.",
"description": "Adipisci tenetur placeat perspiciatis assumenda. Voluptas officiis magnam reprehenderit possimus non. Tempore delectus numquam veritatis harum natus.",
"created": "1987-12-03T16:33:04+01:00",
Expand All @@ -95,7 +95,7 @@
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/00KXGYAJ4A1D5P0EA11SKF0BG8",
"@id": "/v2/screen-groups/00KXGYAJ4A1D5P0EA11SKF0BG8",
"title": "A laudantium aspernatur qui.",
"description": "Non fugiat nobis occaecati. Sed ut velit beatae amet ea esse. Quo dolorem commodi magni at. Illum voluptatem neque nobis et ut. Ad rerum tempore vel commodi suscipit corrupti.",
"created": "1991-09-10T22:36:56+02:00",
Expand All @@ -106,15 +106,15 @@
],
"hydra:totalItems": 20,
"hydra:view": {
"@id": "/v1/screen-groups?page=1",
"@id": "/v2/screen-groups?page=1",
"@type": "hydra:PartialCollectionView",
"hydra:first": "/v1/screen-groups?page=1",
"hydra:last": "/v1/screen-groups?page=2",
"hydra:next": "/v1/screen-groups?page=2"
"hydra:first": "/v2/screen-groups?page=1",
"hydra:last": "/v2/screen-groups?page=2",
"hydra:next": "/v2/screen-groups?page=2"
},
"hydra:search": {
"@type": "hydra:IriTemplate",
"hydra:template": "/v1/screen-groups{?title,description,order[title],order[description]}",
"hydra:template": "/v2/screen-groups{?title,description,order[title],order[description]}",
"hydra:variableRepresentation": "BasicRepresentation",
"hydra:mapping": [
{
Expand Down
30 changes: 15 additions & 15 deletions cypress/fixtures/info-modal/groups.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
{
"@id": "/v1/screen-groups",
"@id": "/v2/screen-groups",
"@type": "hydra:Collection",
"hydra:member": [
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/01FZ0CS2X360BEWNJXV3CB8143",
"@id": "/v2/screen-groups/01FZ0CS2X360BEWNJXV3CB8143",
"title": "4",
"description": "",
"created": "2022-03-25T12:18:24+01:00",
"modified": "2022-03-25T12:18:24+01:00",
"modifiedBy": "[email protected]",
"createdBy": "[email protected]",
"campaigns": "/v1/screen-groups/01FZ0CS2X360BEWNJXV3CB8143/campaigns",
"screens": "/v1/screen-groups/01FZ0CS2X360BEWNJXV3CB8143/screens"
"campaigns": "/v2/screen-groups/01FZ0CS2X360BEWNJXV3CB8143/campaigns",
"screens": "/v2/screen-groups/01FZ0CS2X360BEWNJXV3CB8143/screens"
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/01FZ0CQF398WNC3KBAF3PHEFQV",
"@id": "/v2/screen-groups/01FZ0CQF398WNC3KBAF3PHEFQV",
"title": "1",
"description": "",
"created": "2022-03-25T12:17:31+01:00",
"modified": "2022-03-25T12:17:31+01:00",
"modifiedBy": "[email protected]",
"createdBy": "[email protected]",
"campaigns": "/v1/screen-groups/01FZ0CQF398WNC3KBAF3PHEFQV/campaigns",
"screens": "/v1/screen-groups/01FZ0CQF398WNC3KBAF3PHEFQV/screens"
"campaigns": "/v2/screen-groups/01FZ0CQF398WNC3KBAF3PHEFQV/campaigns",
"screens": "/v2/screen-groups/01FZ0CQF398WNC3KBAF3PHEFQV/screens"
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/01FZ0CQ2HBRENEX0A76SFQYFR1",
"@id": "/v2/screen-groups/01FZ0CQ2HBRENEX0A76SFQYFR1",
"title": "3",
"description": "",
"created": "2022-03-25T12:17:19+01:00",
"modified": "2022-03-25T12:17:19+01:00",
"modifiedBy": "[email protected]",
"createdBy": "[email protected]",
"campaigns": "/v1/screen-groups/01FZ0CQ2HBRENEX0A76SFQYFR1/campaigns",
"screens": "/v1/screen-groups/01FZ0CQ2HBRENEX0A76SFQYFR1/screens"
"campaigns": "/v2/screen-groups/01FZ0CQ2HBRENEX0A76SFQYFR1/campaigns",
"screens": "/v2/screen-groups/01FZ0CQ2HBRENEX0A76SFQYFR1/screens"
},
{
"@type": "ScreenGroup",
"@id": "/v1/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W",
"@id": "/v2/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W",
"title": "2",
"description": "",
"created": "2022-03-24T20:57:52+01:00",
"modified": "2022-03-25T12:30:14+01:00",
"modifiedBy": "[email protected]",
"createdBy": "[email protected]",
"campaigns": "/v1/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W/campaigns",
"screens": "/v1/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W/screens"
"campaigns": "/v2/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W/campaigns",
"screens": "/v2/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W/screens"
}
],
"hydra:totalItems": 4,
"hydra:view": {
"@id": "/v1/screen-groups?order%5BcreatedAt%5D=desc",
"@id": "/v2/screen-groups?order%5BcreatedAt%5D=desc",
"@type": "hydra:PartialCollectionView"
},
"hydra:search": {
"@type": "hydra:IriTemplate",
"hydra:template": "/v1/screen-groups{?title,description,createdBy,createdBy[],modifiedBy,modifiedBy[],order[title],order[description],order[createdAt]}",
"hydra:template": "/v2/screen-groups{?title,description,createdBy,createdBy[],modifiedBy,modifiedBy[],order[title],order[description],order[createdAt]}",
"hydra:variableRepresentation": "BasicRepresentation",
"hydra:mapping": [
{
Expand Down
4 changes: 2 additions & 2 deletions cypress/fixtures/info-modal/playlist.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"@type": "Playlist",
"@id": "/v1/playlists/01FYZYGZBJD1651H9MW2FJJD6N",
"@id": "/v2/playlists/01FYZYGZBJD1651H9MW2FJJD6N",
"title": "yghjknlm",
"description": "",
"schedules": [],
"created": "2022-03-25T08:09:19.000Z",
"modified": "2022-03-25T08:22:05.000Z",
"modifiedBy": "[email protected]",
"createdBy": "[email protected]",
"slides": "/v1/playlists/01FYZYGZBJD1651H9MW2FJJD6N/slides",
"slides": "/v2/playlists/01FYZYGZBJD1651H9MW2FJJD6N/slides",
"campaignScreens": [],
"campaignScreenGroups": [],
"tenants": [],
Expand Down
14 changes: 7 additions & 7 deletions cypress/fixtures/info-modal/screen.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"@id": "/v1/screen-groups",
"@id": "/v2/screen-groups",
"@type": "hydra:Collection",
"hydra:member": [
{
"@id": "/v1/screens/01FYYRA11JSAPV15H29GGA9P78",
"@id": "/v2/screens/01FYYRA11JSAPV25H29GGA9P78",
"@type": "Screen",
"size": 0,
"resolutionWidth": 0,
"screenCampaigns": [],
"resolutionHeight": 0,
"screenLayout": "/v1/layouts/01FMYMAB1EQYQ40QE0C7Y6NVBK",
"screenLayout": "/v2/layouts/01FMYMAB1EQYQ40QE0C7Y6NVBK",
"location": "",
"playlistScreenRegions": [],
"screenGroups": [
"/v1/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W"
"/v2/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W"
],
"screenUser": null,
"title": "a",
"description": "",
"tenant": "/v1/tenants/008VDAQKX018QR0MZ10RSJ1TF3",
"id": "01FYYRA11JSAPV15H29GGA9P78",
"tenant": "/v2/tenants/008VDAQKX018QR0MZ10RSJ1TF3",
"id": "01FYYRA11JSAPV25H29GGA9P78",
"createdAt": "2022-03-24T21:01:25+01:00",
"modifiedAt": "2022-03-24T21:01:25+01:00",
"createdBy": "[email protected]",
Expand All @@ -28,7 +28,7 @@
],
"hydra:totalItems": 1,
"hydra:view": {
"@id": "/v1/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W/screens?itemsPerPage=5",
"@id": "/v2/screen-groups/01FYYR3GV7Q2K5TSBA29S3WF8W/screens?itemsPerPage=5",
"@type": "hydra:PartialCollectionView"
}
}
10 changes: 5 additions & 5 deletions cypress/fixtures/info-modal/slide.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"@id": "/v1/playlist-slides",
"@id": "/v2/playlist-slides",
"@type": "hydra:Collection",
"hydra:member": [
{
"@type": "PlaylistSlide",
"@id": "/v1/playlist-slides/01FYZZC3BQ322PC4K7TRDYP675",
"@id": "/v2/playlist-slides/01FYZZC3BQ322PC4K7TRDYP675",
"slide": {
"@type": "Slide",
"@id": "/v1/slides/01FYZYHVMWMB575NPNAX55TK7G",
"@id": "/v2/slides/01FYZYHVMWMB575NPNAX55TK7G",
"title": "Slide",
"description": "",
"created": "2022-03-25T08:09:48+01:00",
"modified": "2022-03-25T08:24:07+01:00",
"modifiedBy": "[email protected]",
"createdBy": "[email protected]",
"templateInfo": {
"@id": "/v1/templates/01FP2SNGFN0BZQH03KCBXHKYHG",
"@id": "/v2/templates/01FP2SNGFN0BZQH03KCBXHKYHG",
"options": []
},
"theme": "",
"onPlaylists": [
"/v1/playlists/01FYZYGZBJD1651H9MW2FJJD6N"
"/v2/playlists/01FYZYGZBJD1651H9MW2FJJD6N"
],
"duration": null,
"published": {
Expand Down
Loading

0 comments on commit 013d299

Please sign in to comment.