Skip to content

Commit 666631c

Browse files
committed
3172: Fixed coding standards
1 parent 2878006 commit 666631c

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
lines changed

src/app.jsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { useEffect, useRef, useState } from "react";
2+
import PropTypes from "prop-types";
23
import Screen from "./components/screen";
34
import ContentService from "./service/content-service";
45
import ConfigLoader from "./util/config-loader";
@@ -16,9 +17,9 @@ import constants from "./util/constants";
1617
/**
1718
* App component.
1819
*
19-
* @param root0
20-
* @param root0.preview
21-
* @param root0.previewId
20+
* @param {object} props The props.
21+
* @param {string | null} props.preview Type of preview to enable.
22+
* @param {string | null} props.previewId The id of the entity to preview.
2223
* @returns {object}
2324
* The component.
2425
*/
@@ -235,6 +236,7 @@ function App({ preview, previewId }) {
235236
statusService.setStatusInUrl();
236237
}
237238

239+
/* eslint-disable-next-line consistent-return */
238240
return function cleanup() {
239241
logger.info("Unmounting App.");
240242

@@ -285,4 +287,9 @@ function App({ preview, previewId }) {
285287
);
286288
}
287289

290+
App.propTypes = {
291+
preview: PropTypes.string,
292+
previewId: PropTypes.string,
293+
};
294+
288295
export default App;

src/data-sync/pull-strategy.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import cloneDeep from 'lodash.clonedeep';
22
import isPublished from '../util/isPublished';
33
import logger from '../logger/logger';
44
import ApiHelper from './api-helper';
5-
import apiHelper from "./api-helper";
65

76
/**
87
* PullStrategy.
@@ -414,7 +413,7 @@ class PullStrategy {
414413
}
415414

416415
async getTemplateData(slide) {
417-
return new Promise((resolve, reject) => {
416+
return new Promise((resolve) => {
418417
const templatePath = slide.templateInfo['@id'];
419418

420419
this.apiHelper.getPath(templatePath).then((data) => {
@@ -424,7 +423,7 @@ class PullStrategy {
424423
}
425424

426425
async getFeedData(slide) {
427-
return new Promise((resolve, reject) => {
426+
return new Promise((resolve) => {
428427
if (!slide?.feed?.feedUrl) {
429428
resolve([]);
430429
} else {
@@ -436,7 +435,7 @@ class PullStrategy {
436435
}
437436

438437
async getMediaData(media) {
439-
return new Promise((resolve, reject) => {
438+
return new Promise((resolve) => {
440439
this.apiHelper.getPath(media).then((data) => {
441440
resolve(data);
442441
});

src/service/content-service.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import sha256 from 'crypto-js/sha256';
22
import Base64 from 'crypto-js/enc-base64';
3-
import { object, string } from 'prop-types';
4-
import Logger from '../logger/logger';
53
import PullStrategy from '../data-sync/pull-strategy';
64
import {
75
screenForPlaylistPreview,
@@ -88,7 +86,7 @@ class ContentService {
8886

8987
this.stopSyncHandler();
9088

91-
Logger.log(
89+
logger.log(
9290
'info',
9391
`Event received: Start data synchronization from ${data?.screenPath}`
9492
);
@@ -98,7 +96,7 @@ class ContentService {
9896
);
9997
this.startSyncing(data.screenPath);
10098
} else {
101-
Logger.log('error', 'Error: screenPath not set.');
99+
logger.log('error', 'Error: screenPath not set.');
102100
}
103101
}
104102

@@ -211,7 +209,7 @@ class ContentService {
211209
async startPreview(event) {
212210
const data = event.detail;
213211
const { mode, id } = data;
214-
Logger.log('info', `Starting preview. Mode: ${mode}, ID: ${id}`);
212+
logger.log('info', `Starting preview. Mode: ${mode}, ID: ${id}`);
215213

216214
const config = await ConfigLoader.loadConfig();
217215

@@ -267,7 +265,7 @@ class ContentService {
267265
})
268266
);
269267
} else {
270-
Logger.error(`Unsupported preview mode: ${mode}.`);
268+
logger.error(`Unsupported preview mode: ${mode}.`);
271269
}
272270
}
273271

src/service/token-service.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,19 @@ class TokenService {
132132
checkToken = () => {
133133
const expiredState = this.getExpireState();
134134

135-
if ([constants.NO_EXPIRE, constants.NO_ISSUED_AT, constants.NO_TOKEN].includes(expiredState)) {
135+
if (
136+
[
137+
constants.NO_EXPIRE,
138+
constants.NO_ISSUED_AT,
139+
constants.NO_TOKEN,
140+
].includes(expiredState)
141+
) {
136142
// Ignore. No token saved in storage.
137143
} else if (expiredState === constants.TOKEN_EXPIRED) {
138144
statusService.setError(constants.ERROR_TOKEN_EXPIRED);
139-
} else if (expiredState === constants.TOKEN_VALID_SHOULD_HAVE_BEEN_REFRESHED) {
145+
} else if (
146+
expiredState === constants.TOKEN_VALID_SHOULD_HAVE_BEEN_REFRESHED
147+
) {
140148
statusService.setError(
141149
constants.ERROR_TOKEN_VALID_SHOULD_HAVE_BEEN_REFRESHED
142150
);

0 commit comments

Comments
 (0)