Skip to content

Commit 39c8f70

Browse files
committed
4565: Applied prettier styles to assets. Added changelog. Removed tests
1 parent 9766da9 commit 39c8f70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+449
-1605
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
77
* Gathered all repositories in one Symfony application.
88
* Changed to vite 7 and rolldown.
99
* Added ADRs 008 and 009.
10+
* Cleaned up Github Actions workflows.
1011

1112
### NB! Prior to 3.x the project was split into separate repositories
1213

assets/admin/components/slide/content/poster/poster-helper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const formatDate = (date, format) => {
1111
return capitalize(
1212
dayjs(date)
1313
.locale(localeDa)
14-
.format(format ?? "LLLL")
14+
.format(format ?? "LLLL"),
1515
);
1616
};
1717

@@ -66,7 +66,7 @@ const loadDropdownOptionsPromise = (url, headers, inputValue, type) => {
6666
const getHeaders = () => {
6767
const apiToken = localStorage.getItem(localStorageKeys.API_TOKEN);
6868
const tenantKey = JSON.parse(
69-
localStorage.getItem(localStorageKeys.SELECTED_TENANT)
69+
localStorage.getItem(localStorageKeys.SELECTED_TENANT),
7070
);
7171

7272
const headers = {

assets/admin/components/util/schedule/schedule-util.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ const createNewSchedule = () => {
6969
now.getMonth(),
7070
now.getDate(),
7171
now.getHours(),
72-
now.getMinutes()
73-
)
72+
now.getMinutes(),
73+
),
7474
),
7575
until: null,
7676
wkst: RRule.MO,

assets/admin/redux/dynamic-base-query.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { fetchBaseQuery } from "@reduxjs/toolkit/query/react";
22
import localStorageKeys from "../components/util/local-storage-keys";
33

44
const extendedBaseQuery = async (args, api, extraOptions) => {
5-
const baseUrl = '/';
5+
const baseUrl = "/";
66

77
const newArgs = { ...args };
88

@@ -28,7 +28,7 @@ const extendedBaseQuery = async (args, api, extraOptions) => {
2828
if (newArgs.params["screenUser.latestRequest"]) {
2929
const key = Object.keys(newArgs.params["screenUser.latestRequest"])[0];
3030
const value = Object.values(
31-
newArgs.params["screenUser.latestRequest"]
31+
newArgs.params["screenUser.latestRequest"],
3232
)[0];
3333
newArgs.params[`screenUser.latestRequest[${key}]`] = `${value}`;
3434
}
@@ -65,7 +65,7 @@ const extendedBaseQuery = async (args, api, extraOptions) => {
6565

6666
// Attach tenant key .
6767
const tenantKey = JSON.parse(
68-
localStorage.getItem(localStorageKeys.SELECTED_TENANT)
68+
localStorage.getItem(localStorageKeys.SELECTED_TENANT),
6969
);
7070

7171
if (tenantKey) {
@@ -75,7 +75,7 @@ const extendedBaseQuery = async (args, api, extraOptions) => {
7575
const baseResult = await fetchBaseQuery({ baseUrl })(
7676
newArgs,
7777
api,
78-
extraOptions
78+
extraOptions,
7979
);
8080

8181
// Handle authentication errors. Emit that the user should reauthenticate.

assets/client/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import "./app.css";
22

3-
console.log('Hello client');
3+
console.log("Hello client");

assets/client/data-sync/api-helper.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import logger from '../logger/logger';
2-
import appStorage from '../util/app-storage';
1+
import logger from "../logger/logger";
2+
import appStorage from "../util/app-storage";
33

44
class ApiHelper {
5-
endpoint = '';
5+
endpoint = "";
66

77
/**
88
* Constructor.
@@ -21,44 +21,44 @@ class ApiHelper {
2121
*/
2222
async getPath(path) {
2323
if (!path) {
24-
throw new Error('No path');
24+
throw new Error("No path");
2525
}
2626

2727
let response;
2828

2929
try {
3030
const url = new URL(window.location.href);
31-
const previewToken = url.searchParams.get('preview-token');
32-
const previewTenant = url.searchParams.get('preview-tenant');
31+
const previewToken = url.searchParams.get("preview-token");
32+
const previewTenant = url.searchParams.get("preview-tenant");
3333

34-
logger.log('info', `Fetching: ${this.endpoint + path}`);
34+
logger.log("info", `Fetching: ${this.endpoint + path}`);
3535

3636
const token = appStorage.getToken();
3737
const tenantKey = appStorage.getTenantKey();
3838

3939
if ((!token || !tenantKey) && (!previewToken || !previewTenant)) {
40-
logger.error('Token or tenantKey not set.');
40+
logger.error("Token or tenantKey not set.");
4141

4242
return null;
4343
}
4444

4545
response = await fetch(this.endpoint + path, {
4646
headers: {
4747
authorization: `Bearer ${previewToken ?? token}`,
48-
'Authorization-Tenant-Key': previewTenant ?? tenantKey,
48+
"Authorization-Tenant-Key": previewTenant ?? tenantKey,
4949
},
5050
});
5151

5252
if (response.ok === false) {
5353
// TODO: Change to a better strategy for triggering reauthenticate.
5454
if (response.status === 401) {
55-
document.dispatchEvent(new Event('reauthenticate'));
55+
document.dispatchEvent(new Event("reauthenticate"));
5656
}
5757

5858
logger.error(
5959
`Failed to fetch (status: ${response.status}): ${
6060
this.endpoint + path
61-
}`
61+
}`,
6262
);
6363

6464
return null;
@@ -89,8 +89,8 @@ class ApiHelper {
8989
try {
9090
// eslint-disable-next-line no-await-in-loop
9191
const responseData = await this.getPath(nextPath);
92-
results = results.concat(responseData['hydra:member']);
93-
if (results.length < responseData['hydra:totalItems']) {
92+
results = results.concat(responseData["hydra:member"]);
93+
if (results.length < responseData["hydra:totalItems"]) {
9494
page += 1;
9595
continueLoop = true;
9696
nextPath = `${path}?page=${page}`;

assets/client/data-sync/data-sync.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import PullStrategy from './pull-strategy';
1+
import PullStrategy from "./pull-strategy";
22

33
/**
44
* DataSync.

assets/client/data-sync/pull-strategy.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import cloneDeep from 'lodash.clonedeep';
2-
import isPublished from '../util/isPublished';
3-
import logger from '../logger/logger';
4-
import ApiHelper from './api-helper';
1+
import cloneDeep from "lodash.clonedeep";
2+
import isPublished from "../util/isPublished";
3+
import logger from "../logger/logger";
4+
import ApiHelper from "./api-helper";
55

66
/**
77
* PullStrategy.
@@ -18,7 +18,7 @@ class PullStrategy {
1818
interval;
1919

2020
// Path to screen that should be loaded data for.
21-
entryPoint = '';
21+
entryPoint = "";
2222

2323
/**
2424
* Constructor.
@@ -34,7 +34,7 @@ class PullStrategy {
3434
this.interval = config?.interval ?? 60000 * 5;
3535
this.entryPoint = config.entryPoint;
3636

37-
this.apiHelper = new ApiHelper(config.endpoint ?? '');
37+
this.apiHelper = new ApiHelper(config.endpoint ?? "");
3838
}
3939

4040
/**
@@ -49,16 +49,16 @@ class PullStrategy {
4949
try {
5050
const response = await this.apiHelper.getPath(screen.inScreenGroups);
5151

52-
if (Object.prototype.hasOwnProperty.call(response, 'hydra:member')) {
52+
if (Object.prototype.hasOwnProperty.call(response, "hydra:member")) {
5353
const promises = [];
5454

55-
response['hydra:member'].forEach((group) => {
55+
response["hydra:member"].forEach((group) => {
5656
promises.push(this.apiHelper.getAllResultsFromPath(group.campaigns));
5757
});
5858

5959
await Promise.allSettled(promises).then((results) => {
6060
results.forEach((result) => {
61-
if (result.status === 'fulfilled') {
61+
if (result.status === "fulfilled") {
6262
result.value.results.forEach(({ campaign }) => {
6363
screenGroupCampaigns.push(campaign);
6464
});
@@ -74,11 +74,11 @@ class PullStrategy {
7474

7575
try {
7676
const screenCampaignsResponse = await this.apiHelper.getPath(
77-
screen.campaigns
77+
screen.campaigns,
7878
);
7979

80-
screenCampaigns = screenCampaignsResponse['hydra:member'].map(
81-
({ campaign }) => campaign
80+
screenCampaigns = screenCampaignsResponse["hydra:member"].map(
81+
({ campaign }) => campaign,
8282
);
8383
} catch (err) {
8484
logger.error(err);
@@ -109,13 +109,13 @@ class PullStrategy {
109109
Promise.allSettled(promises)
110110
.then((results) => {
111111
results.forEach((result) => {
112-
if (result.status === 'fulfilled') {
112+
if (result.status === "fulfilled") {
113113
const members = result?.value?.results ?? [];
114114
const matches = result?.value?.path?.match(reg) ?? [];
115115

116116
if (matches?.groups?.regionId) {
117117
regionData[matches.groups.regionId] = members.map(
118-
({ playlist }) => playlist
118+
({ playlist }) => playlist,
119119
);
120120
}
121121
}
@@ -150,8 +150,8 @@ class PullStrategy {
150150
{
151151
regionKey,
152152
playlistKey,
153-
}
154-
)
153+
},
154+
),
155155
);
156156
}
157157
}
@@ -160,13 +160,13 @@ class PullStrategy {
160160
.then((results) => {
161161
results.forEach((result) => {
162162
if (
163-
result.status === 'fulfilled' &&
164-
Object.prototype.hasOwnProperty.call(result.value, 'keys')
163+
result.status === "fulfilled" &&
164+
Object.prototype.hasOwnProperty.call(result.value, "keys")
165165
) {
166166
regionData[result.value.keys.regionKey][
167167
result.value.keys.playlistKey
168168
].slidesData = result.value.results.map(
169-
(playlistSlide) => playlistSlide.slide
169+
(playlistSlide) => playlistSlide.slide,
170170
);
171171
}
172172
});
@@ -189,7 +189,7 @@ class PullStrategy {
189189
screen = await this.apiHelper.getPath(screenPath);
190190
} catch (err) {
191191
logger.warn(
192-
`Screen (${screenPath}) not loaded. Aborting content update.`
192+
`Screen (${screenPath}) not loaded. Aborting content update.`,
193193
);
194194

195195
return;
@@ -233,7 +233,7 @@ class PullStrategy {
233233
logger.info(`Has active campaign.`);
234234

235235
// Create ulid to connect the campaign with the regions/playlists.
236-
const campaignRegionId = '01G112XBWFPY029RYFB8X2H4KD';
236+
const campaignRegionId = "01G112XBWFPY029RYFB8X2H4KD";
237237

238238
// Campaigns are always in full screen layout, for simplicity.
239239
newScreen.layoutData = {
@@ -243,8 +243,8 @@ class PullStrategy {
243243
},
244244
regions: [
245245
{
246-
'@id': `/v2/layouts/regions/${campaignRegionId}`,
247-
gridArea: ['a'],
246+
"@id": `/v2/layouts/regions/${campaignRegionId}`,
247+
gridArea: ["a"],
248248
},
249249
],
250250
};
@@ -255,7 +255,7 @@ class PullStrategy {
255255
`/v2/screens/01FV9K4K0Y0X0K1J88SQ6B64VT/regions/${campaignRegionId}/playlists`,
256256
];
257257
newScreen.regionData = await this.getSlidesForRegions(
258-
newScreen.regionData
258+
newScreen.regionData,
259259
);
260260
} else {
261261
logger.info(`Has no active campaign.`);
@@ -317,7 +317,7 @@ class PullStrategy {
317317
) {
318318
previousSlide = cloneDeep(
319319
this.lastestScreenData.regionData[regionKey][playlistKey]
320-
.slidesData[slideKey]
320+
.slidesData[slideKey],
321321
);
322322
} else {
323323
previousSlide = {};
@@ -331,13 +331,13 @@ class PullStrategy {
331331
oldSlideChecksums === null ||
332332
newSlideChecksums.templateInfo !== oldSlideChecksums.templateInfo
333333
) {
334-
const templatePath = slide.templateInfo['@id'];
334+
const templatePath = slide.templateInfo["@id"];
335335

336336
// Load template into slide.templateData.
337337
if (
338338
Object.prototype.hasOwnProperty.call(
339339
fetchedTemplates,
340-
templatePath
340+
templatePath,
341341
)
342342
) {
343343
slide.templateData = fetchedTemplates[templatePath];
@@ -356,7 +356,7 @@ class PullStrategy {
356356
// A slide cannot work without templateData. Mark as invalid.
357357
if (slide.templateData === null) {
358358
logger.warn(
359-
`Template (${slide.templateInfo['@id']}) not loaded, slideId: ${slide['@id']}`
359+
`Template (${slide.templateInfo["@id"]}) not loaded, slideId: ${slide["@id"]}`,
360360
);
361361
slide.invalid = true;
362362
}
@@ -400,7 +400,7 @@ class PullStrategy {
400400
this.lastestScreenData = newScreen;
401401

402402
// Deliver result to rendering
403-
const event = new CustomEvent('content', {
403+
const event = new CustomEvent("content", {
404404
detail: {
405405
screen: newScreen,
406406
},
@@ -414,7 +414,7 @@ class PullStrategy {
414414

415415
async getTemplateData(slide) {
416416
return new Promise((resolve) => {
417-
const templatePath = slide.templateInfo['@id'];
417+
const templatePath = slide.templateInfo["@id"];
418418

419419
this.apiHelper.getPath(templatePath).then((data) => {
420420
resolve(data);
@@ -454,7 +454,7 @@ class PullStrategy {
454454
// Start interval for pull periodically.
455455
this.activeInterval = setInterval(
456456
() => this.getScreen(this.entryPoint),
457-
this.interval
457+
this.interval,
458458
);
459459
});
460460
}

assets/client/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import React from 'react';
2-
import { createRoot } from 'react-dom/client';
3-
import App from './app';
1+
import React from "react";
2+
import { createRoot } from "react-dom/client";
3+
import App from "./app";
44

55
const url = new URL(window.location.href);
6-
const preview = url.searchParams.get('preview');
7-
const previewId = url.searchParams.get('preview-id');
6+
const preview = url.searchParams.get("preview");
7+
const previewId = url.searchParams.get("preview-id");
88

9-
const container = document.getElementById('root');
9+
const container = document.getElementById("root");
1010
const root = createRoot(container);
1111

1212
root.render(<App preview={preview} previewId={previewId} />);

assets/client/logger/logger.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import pino from 'pino';
1+
import pino from "pino";
22

33
const logger = pino();
44

0 commit comments

Comments
 (0)