From fb82dba4282b65b0c94aeb5b0eef895f9e0b002a Mon Sep 17 00:00:00 2001 From: Reinder Kraaij <kraaij@astron.nl> Date: Fri, 27 Oct 2023 16:09:23 +0200 Subject: [PATCH] fixed code quality items --- .vscode/settings.json | 3 +++ SAS/TMSS/frontend/tmss_webapp/cleanTemplateSchemas.js | 1 - SAS/TMSS/frontend/tmss_webapp/src/App.js | 2 +- .../frontend/tmss_webapp/src/authenticate/auth.store.js | 2 +- .../tmss_webapp/src/components/CustomPageSpinner.js | 2 +- .../frontend/tmss_webapp/src/components/FormActionbar.js | 2 +- .../src/components/Spreadsheet/BeamformerRenderer.js | 2 +- .../src/components/Spreadsheet/BetweenRenderer.js | 2 +- .../src/components/Spreadsheet/CustomDateComponent.js | 2 +- .../src/components/Spreadsheet/DegreeInputmask.js | 2 +- .../src/components/Spreadsheet/MultiSelector.js | 2 +- .../src/components/Spreadsheet/NumericEditor.js | 2 +- .../src/components/Spreadsheet/OffsetTimeInputmask.js | 2 +- .../src/components/Spreadsheet/TimeInputmask.js | 2 +- .../frontend/tmss_webapp/src/components/ViewTable.js | 5 +---- SAS/TMSS/frontend/tmss_webapp/src/index.js | 2 +- .../tmss_webapp/src/layout/components/AccessDenied.js | 4 ++-- .../tmss_webapp/src/layout/components/AppFooter.js | 2 +- .../tmss_webapp/src/layout/components/AppLoader.js | 2 +- .../tmss_webapp/src/layout/components/PageActionMenu.js | 4 ++-- SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js | 2 +- .../frontend/tmss_webapp/src/routes/Cycle/list.test.js | 2 +- SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js | 2 +- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js | 2 +- SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js | 2 +- .../src/routes/Report/cycle/report.failure.rate.js | 2 +- .../tmss_webapp/src/routes/Report/cycle/report.main.js | 4 ++-- .../tmss_webapp/src/routes/Report/project.report.main.js | 4 ++-- .../src/routes/Reservation/reservation.create.js | 2 +- .../src/routes/Reservation/reservation.list.js | 2 +- .../src/routes/Reservation/reservation.summary.js | 2 +- .../src/routes/Scheduling/SchedulingUnitList.js | 4 ++-- .../tmss_webapp/src/routes/Scheduling/Stations.js | 4 ++-- .../src/routes/Scheduling/ViewSchedulingUnit.js | 2 +- .../Scheduling/components/ProjectScheduleSetSelector.js | 2 +- .../frontend/tmss_webapp/src/routes/Scheduling/create.js | 3 +-- .../tmss_webapp/src/routes/Scheduling/create.test.js | 5 ++--- .../frontend/tmss_webapp/src/routes/Scheduling/edit.js | 2 +- .../src/routes/Scheduling/excelview.schedulingset.js | 9 +++------ .../tmss_webapp/src/routes/Timeline/CalendarTimeline.js | 8 +++----- .../src/routes/Timeline/components/DetailsSummary.js | 2 +- .../routes/Timeline/components/TimelineItemPopover.js | 1 - .../Timeline/components/toolbar/DateTimeNavigator.js | 2 +- .../routes/Timeline/components/toolbar/ZoomAndMove.js | 2 +- .../routes/Timeline/helpers/timeline.renderer.helper.js | 2 +- .../frontend/tmss_webapp/src/routes/Workflow/done.js | 4 ++-- .../frontend/tmss_webapp/src/routes/Workflow/index.js | 2 +- .../tmss_webapp/src/routes/Workflow/ingesting.js | 4 ++-- .../tmss_webapp/src/routes/Workflow/qa.reporting.js | 4 ++-- .../tmss_webapp/src/routes/Workflow/task.assigner.js | 2 +- SAS/TMSS/frontend/tmss_webapp/src/routes/index.js | 1 - .../tmss_webapp/src/services/reservation.service.js | 2 +- .../tmss_webapp/src/services/schedule.service.js | 4 +--- .../frontend/tmss_webapp/src/services/task.service.js | 4 +--- SAS/TMSS/frontend/tmss_webapp/src/show.error.details.js | 2 +- 55 files changed, 68 insertions(+), 82 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..8de9c589299 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "eslint.lintTask.enable": true +} \ No newline at end of file diff --git a/SAS/TMSS/frontend/tmss_webapp/cleanTemplateSchemas.js b/SAS/TMSS/frontend/tmss_webapp/cleanTemplateSchemas.js index bbced2c2f26..446061f49db 100644 --- a/SAS/TMSS/frontend/tmss_webapp/cleanTemplateSchemas.js +++ b/SAS/TMSS/frontend/tmss_webapp/cleanTemplateSchemas.js @@ -1,6 +1,5 @@ //const fs = require('fs').promises; const fs = require('fs'); -const path = require('path'); if (fs.existsSync("build/schemas")) { fs.rm("build/schemas", { recursive: true, force: true }, (err) => { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.js b/SAS/TMSS/frontend/tmss_webapp/src/App.js index 197a4718ce7..c767bde7ac2 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/App.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/App.js @@ -172,7 +172,7 @@ class App extends Component { }); let reloadDirty =function (e) { - let confirmationMessage = "\o/"; + let confirmationMessage = "\\o/"; (e || window.event).returnValue = confirmationMessage; //Gecko + IE return confirmationMessage; }; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.store.js b/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.store.js index f14a99f2c1a..b8e0fb0582e 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.store.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.store.js @@ -1,5 +1,5 @@ import * as redux from 'redux'; -import { ObjectFlags } from 'typescript'; + let permissionStack = {}; /** diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/CustomPageSpinner.js b/SAS/TMSS/frontend/tmss_webapp/src/components/CustomPageSpinner.js index e87b96009a3..8eccfc44a9e 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/CustomPageSpinner.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/CustomPageSpinner.js @@ -1,4 +1,4 @@ -import React, {Component} from 'react'; +import {Component} from 'react'; import { ProgressSpinner } from 'primereact/progressspinner'; /** diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/FormActionbar.js b/SAS/TMSS/frontend/tmss_webapp/src/components/FormActionbar.js index 0b6c48c8545..51da6a4d548 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/FormActionbar.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/FormActionbar.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { Button } from 'primereact/button'; import { Checkbox } from 'primereact/checkbox'; import UIConstants from '../utils/ui.constants'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BeamformerRenderer.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BeamformerRenderer.js index 7990622fff1..11a24e6f6d1 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BeamformerRenderer.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BeamformerRenderer.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; export default class BeamformersRenderer extends Component { constructor(props) { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BetweenRenderer.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BetweenRenderer.js index dbcdfad52b8..0212bd528e1 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BetweenRenderer.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/BetweenRenderer.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; export default class BetweenRenderer extends Component { constructor(props) { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/CustomDateComponent.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/CustomDateComponent.js index 5d90aeb89f6..08b61c59ac3 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/CustomDateComponent.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/CustomDateComponent.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import flatpickr from 'flatpickr'; import "flatpickr/dist/flatpickr.css"; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/DegreeInputmask.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/DegreeInputmask.js index 9585e69d19e..df8d569ae60 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/DegreeInputmask.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/DegreeInputmask.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import Validator from '../../utils/validator'; import Cleave from 'cleave.js/react'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/MultiSelector.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/MultiSelector.js index 1ca3e8b9e1a..0f3744fa12e 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/MultiSelector.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/MultiSelector.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import {MultiSelect} from 'primereact/multiselect'; import _ from 'lodash'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/NumericEditor.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/NumericEditor.js index 237cd4c1c68..05a55ac6458 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/NumericEditor.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/NumericEditor.js @@ -1,4 +1,4 @@ -import React, {Component, createRef} from 'react'; +import {Component, createRef} from 'react'; // backspace starts the editor on Windows const KEY_BACKSPACE = 'Backspace'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/OffsetTimeInputmask.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/OffsetTimeInputmask.js index 5e19e22abf9..05c73a049e7 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/OffsetTimeInputmask.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/OffsetTimeInputmask.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import Cleave from 'cleave.js/react'; const BG_COLOR= '#f878788f'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/TimeInputmask.js b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/TimeInputmask.js index 1376503f287..06152a9df76 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/TimeInputmask.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/Spreadsheet/TimeInputmask.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import Validator from '../../utils/validator'; import Cleave from 'cleave.js/react'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js index 8879d005654..9fab663dc5c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js @@ -1,6 +1,3 @@ -/* eslint-disable react-hooks/exhaustive-deps */ -/* eslint-disable jsx-a11y/anchor-is-valid */ -/* eslint-disable jsx-a11y/aria-role */ import React, { useRef, useState } from "react"; import { useFlexLayout , useResizeColumns, useSortBy, useTable, useFilters, useGlobalFilter, useAsyncDebounce, usePagination, useRowSelect, useColumnOrder } from 'react-table' import matchSorter from 'match-sorter' @@ -2787,7 +2784,7 @@ function ViewTable(props) { console.error('Error', err) } return value; - }; + } /** * To fetch data from server side - Start diff --git a/SAS/TMSS/frontend/tmss_webapp/src/index.js b/SAS/TMSS/frontend/tmss_webapp/src/index.js index cc6fc8646bc..57498ee14f1 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/index.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/index.js @@ -1,5 +1,5 @@ import 'react-app-polyfill/ie11'; -import React from 'react'; + import ReactDOM from 'react-dom'; import './index.css'; import App from './App'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AccessDenied.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AccessDenied.js index 76dd3d98c91..c8c10c74797 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AccessDenied.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AccessDenied.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; export class AccessDenied extends Component { @@ -6,7 +6,7 @@ export class AccessDenied extends Component { return ( <> <h1>Access Denied</h1> - <p>Sorry, you don't have permission to view this page or do this operation. + <p>Sorry, you don't have permission to view this page or do this operation. Please contact the system administrator or support user for any assistance.</p> </> ); diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppFooter.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppFooter.js index 6453a2d30d4..6b2718e5da6 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppFooter.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppFooter.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; export class AppFooter extends Component { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppLoader.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppLoader.js index 92930365516..fe4d225d865 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppLoader.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppLoader.js @@ -1,5 +1,5 @@ import { ThreeDots} from 'react-loader-spinner'; -import React, { Component } from 'react' +import { Component } from 'react' export class AppLoader extends Component{ diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageActionMenu.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageActionMenu.js index 75f8515a2f3..b63bb6779e0 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageActionMenu.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageActionMenu.js @@ -1,4 +1,4 @@ -import React from "react"; + import {Link} from "react-router-dom"; //TODO: old component (should test + refactor) @@ -35,7 +35,7 @@ const PageActionMenu = ({actions, className}) => { ); } else if (action.type === 'element') { return ( - <div className={action.classes} dangerouslySetInnerHTML={{__html: action.element}}/> + <div key={`index`} className={action.classes} dangerouslySetInnerHTML={{__html: action.element}}/> ) } else if (action.type === 'ext_link') { return ( diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js index 25049271f53..0765c214aac 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js @@ -114,7 +114,7 @@ export class CycleEdit extends Component { this.cycleQuota.push(quota); const conversionFactor = this.resourceUnitMap[resource?.quantity_value]?this.resourceUnitMap[resource.quantity_value].conversionFactor:1; cycleQuota[quota.resource_type_id] = quota.value / conversionFactor; - }; + } } // Remove the already assigned resources from the resoureList diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.test.js index 987939ae477..225fc9c6a41 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.test.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/list.test.js @@ -1,5 +1,5 @@ //import "babel-polyfill"; -import React from 'react'; + import ReactDOM, {unmountComponentAtNode} from 'react-dom'; import { BrowserRouter as Router } from 'react-router-dom'; import 'regenerator-runtime/runtime' diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js index 1738a8a00dc..546b2ed95ac 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js @@ -76,7 +76,7 @@ export class CycleView extends Component { let resource = _.find(resources, ['name', quota.resource_type_id]); quota.resource = resource; cycleQuota.push(quota); - }; + } this.setState({cycle: cycle, cycleQuota: cycleQuota, isLoading: false}); } else { this.setState({redirect: "../../not-found"}) diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js index 54ba7c6f429..a6f9df60716 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import ProjectService from '../../services/project.service'; import ViewTable from '../../components/ViewTable'; import AppLoader from '../../layout/components/AppLoader'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js index 7b0b900d457..896ae7ee072 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js @@ -107,7 +107,7 @@ export class ProjectView extends Component { let resource = _.find(resources, ['name', quota.resource_type_id]); quota.resource = resource?resource:{name:quota.resource_type_id}; projectQuota.push(quota); - }; + } this.setState({project: project, projectQuota: projectQuota, isLoading: false}); } else { this.setState({redirect: "../../not-found"}) diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.failure.rate.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.failure.rate.js index ed276c5eb86..16d33059449 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.failure.rate.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.failure.rate.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import 'chart.js/auto'; import { Bar } from 'react-chartjs-2'; import { Dropdown } from 'primereact/dropdown'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js index 8646ce115bc..c447c6827af 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/cycle/report.main.js @@ -377,7 +377,7 @@ class CycleReportMain extends Component { } else if (scrolled <= 300){ this.setState({scrollTopVisible: false}); } - }; + } /** * Function to scroll to top of the window on clicking ScrollToTop button. @@ -393,7 +393,7 @@ class CycleReportMain extends Component { */ getPageMargins() { return `@page { margin: 138px 72px 138px 72px !important; }`; - }; + } render() { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/project.report.main.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/project.report.main.js index 0e512ff021b..0607b98ab8f 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/project.report.main.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Report/project.report.main.js @@ -298,7 +298,7 @@ class ProjectReportMain extends Component { } else if (scrolled <= 300){ this.setState({scrollTopVisible: false}); } - }; + } /** * Function to scroll to top of the window on clicking ScrollToTop button. @@ -310,7 +310,7 @@ class ProjectReportMain extends Component { } getPageMargins() { return `@page { margin: 138px 72px 138px 72px !important; }`; - }; + } render() { return( diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js index 272a563e487..0adb1f042f1 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js @@ -672,7 +672,7 @@ export class ReservationCreate extends Component { this.setParams('duration', e.value); } else { this.setDurationOrEndValue("stop_time") - }; + } }}></InputMask> <label className={this.state.errors.duration && this.state.touched.duration ? "error" : "info"}> {this.state.errors.duration && this.state.touched.duration ? this.state.errors.duration : ""} diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js index 5f8043a6efc..15338cd2252 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js @@ -672,7 +672,7 @@ export class ReservationList extends Component{ for( const response of responses[0].data.results){ let reservation = this.updateReservation(response, response); this.reservations.push(reservation); - }; + } this.cycleList.map(cycle => { cycle['url'] = cycle.name; }); diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js index f9e0d4405ed..79dcdbaa017 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.summary.js @@ -54,7 +54,7 @@ export class ReservationSummary extends Component { if (dateValue.isValid()) { specification = dateValue.format(UIConstants.CALENDAR_DATETIME_FORMAT); } - } catch (error) {} + } catch (error) { /* empty */ } break; } case "boolean": { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js index 9ee657ac27c..592c60963fe 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js @@ -2101,7 +2101,7 @@ class SchedulingUnitList extends Component{ scheduleunit['suId'] = scheduleunit.id; scheduleunit['suName'] = scheduleunit.name; result.push(scheduleunit); - }; + } return result; } @@ -2619,7 +2619,7 @@ class SchedulingUnitList extends Component{ targetAngle1s.push(UnitConverter.getAngleInput(target.digital_pointing.angle1)); targetAngle2s.push(UnitConverter.getAngleInput(target.digital_pointing.angle2, true)); targetRefs.push(target.digital_pointing.direction_type); - }; + } scheduleunit['targetName'] = this.formatListToNewLineText(targetNames); scheduleunit['targetAngle1'] = this.formatListToNewLineText(targetAngle1s); scheduleunit['targetAngle2'] = this.formatListToNewLineText(targetAngle2s); diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js index 26c7244b287..097001f8bf3 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react'; +import { useState, useEffect } from 'react'; import {MultiSelect} from 'primereact/multiselect'; import { OverlayPanel } from 'primereact/overlaypanel'; import {InputText} from 'primereact/inputtext'; @@ -95,7 +95,7 @@ const Stations = (props) => { } return false; }); - }catch(err) {} + }catch(err) { /* empty */ } // Missing fields present then it matched with station type otherwise its a custom... if (missing_StationFields) { selected_Stations = [...selected_Stations, StationName]; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js index 28f04cf0973..7521fdb2fff 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js @@ -619,7 +619,7 @@ class ViewSchedulingUnit extends Component { schema.properties[param.name] = _.cloneDeep(paramProp); if (schema.properties[param.name]) { schema.properties[param.name].title = param.name; - try { schema.properties[param.name].default = $strategyRefs.get(param.refs[0]); } catch(err) {} + try { schema.properties[param.name].default = $strategyRefs.get(param.refs[0]); } catch(err) { /* empty */ } paramsOutput[param.name] = schema.properties[param.name].default; } } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/components/ProjectScheduleSetSelector.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/components/ProjectScheduleSetSelector.js index 36f7601cc7f..3a84483bd88 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/components/ProjectScheduleSetSelector.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/components/ProjectScheduleSetSelector.js @@ -1,6 +1,6 @@ import {Dropdown} from "primereact/dropdown"; import {Button} from "primereact/button"; -import React from "react"; + import UIConstants from "../../../utils/ui.constants"; function projectSelector(selectedProject, projectDisabled, allProjects, projectErrors, touchedProject, changeProject) { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js index 9ed2426b3d1..38f0d7705b7 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js @@ -290,8 +290,7 @@ export class SchedulingUnitCreate extends Component { schema.properties[param.name].title = param.name; try { schema.properties[param.name].default = $strategyRefs.get(param.refs[0]); - } catch (err) { - } + } catch (err) { /* empty */ } paramsOutput[param.name] = schema.properties[param.name].default || ParserUtility.getDefaultParamValue(schema.properties[param.name].type); } } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js index 18b111761ce..c89e313986c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js @@ -1,5 +1,4 @@ -import React from 'react'; -import { cleanup, fireEvent, screen, act, waitFor } from '@testing-library/react'; +import { cleanup, fireEvent, act, waitFor } from '@testing-library/react'; import renderer from 'react-test-renderer'; import '@testing-library/jest-dom'; @@ -13,7 +12,7 @@ import SUServiceMock from '../../__mocks__/scheduleunit.service.data'; import ProjectServiceMock from '../../__mocks__/project.service.data'; import TaskServiceMock from '../../__mocks__/task.service.data'; import UtilServiceMock from '../../__mocks__/util.service.data'; -import { clickItem, removeReact18ConsoleErrors, renderPage, setMultiSelectValue } from "../../utils/test.helper"; +import { removeReact18ConsoleErrors, renderPage, setMultiSelectValue } from "../../utils/test.helper"; import { setSchedulingUnitStrategy } from "./schedulingunit.test.helper"; let projectListSpy, observStrategiesSpy, taskTemplatesSpy, utilSpy, taskFilterDefSpy, suConstraintTemplateSpy, diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js index 608b0d7edb5..066c1ef4213 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js @@ -160,7 +160,7 @@ export class EditSchedulingUnit extends Component { schema.properties[param.name] = _.cloneDeep(paramProp); if (schema.properties[param.name]) { schema.properties[param.name].title = param.name; - try { schema.properties[param.name].default = $strategyRefs.get(param.refs[0]); } catch(err) {} + try { schema.properties[param.name].default = $strategyRefs.get(param.refs[0]); } catch(err) { /* empty */ } paramsOutput[param.name] = schema.properties[param.name].default || ParserUtility.getDefaultParamValue(schema.properties[param.name].type); } } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js index e2c0ab1df96..d20b18ac928 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js @@ -754,8 +754,7 @@ export class SchedulingSetCreate extends Component { schema.properties[param.name].title = param.name; try { schema.properties[param.name].default = $strategyRefs.get(param.refs[0]); - } catch (err) { - } + } catch (err) { /* empty */ } if (schema.properties[param.name].default) { paramsOutput[param.name] = schema.properties[param.name].default; } @@ -1196,8 +1195,7 @@ export class SchedulingSetCreate extends Component { // } else { paramsOutput[param.name] = property.default; // } - } catch (err) { - } + } catch (err) { /* empty */ } } } return paramsOutput; @@ -2476,8 +2474,7 @@ export class SchedulingSetCreate extends Component { //isValidRow = true; for (var i = 0; i < node.columnController.gridColumns.length; i++) { let column = node.columnController.gridColumns[i]; - if (column.colId === '0') { - } else { + if (column.colId !== '0') { if (rowData.hasOwnProperty(column.colId) && typeof rowData[column.colId] === 'string') { rowData[column.colId] = rowData[column.colId].trim(); } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/CalendarTimeline.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/CalendarTimeline.js index e4ca8a76f4a..91ffa8e1f92 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/CalendarTimeline.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/CalendarTimeline.js @@ -828,9 +828,7 @@ export class CalendarTimeline extends Component { onMouseDown: () => { if (item.type !== "SUNTIME") { this.onItemClick(item); - } else { - - } + } } })} onMouseOver={(evt) => { this.onItemMouseOver(evt, item)}} onMouseOut={(evt) => { this.onItemMouseOut(evt, item)}} @@ -864,7 +862,7 @@ export class CalendarTimeline extends Component { {itemContext.useResizeHandle ? <div {...rightResizeProps} /> : null} </div> ); - }; + } /** Overriding function to pass to timeline component for zoom activities */ onZoom(timelineContext) { @@ -1159,7 +1157,7 @@ export class CalendarTimeline extends Component { // sunsetItem.title = `${timings.sun_set.start} to ${timings.sun_set.end}`; befSunriseItem.title = ""; befSunriseItem.start_time = startTime.clone().hours(0).minutes(0).seconds(0); - befSunriseItem.end_time = startTime.clone().hours(sunriseStart.hours()).minutes(sunriseStart.minutes()).seconds(sunriseStart.seconds());; + befSunriseItem.end_time = startTime.clone().hours(sunriseStart.hours()).minutes(sunriseStart.minutes()).seconds(sunriseStart.seconds()); befSunriseItem.bgColor = "grey"; befSunriseItem.selectedBgColor = "grey"; sunItems.push(befSunriseItem); diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/DetailsSummary.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/DetailsSummary.js index 2a3cd47f70d..cca21d2fd98 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/DetailsSummary.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/DetailsSummary.js @@ -1,6 +1,6 @@ import moment from "moment/moment"; import UIConstants from "../../../utils/ui.constants"; -import React from "react"; + function getFieldGroup(index, labelName, value, formatTime) { if (labelName === "Status") { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/TimelineItemPopover.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/TimelineItemPopover.js index 929796dffc3..058d5a61dbe 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/TimelineItemPopover.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/TimelineItemPopover.js @@ -1,4 +1,3 @@ -import React from "react"; export function getFieldsHtml(fields, status = undefined, style = {}) { const labelClassName = status ? `col-5 su-${status}-icon` : 'col-5' diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/DateTimeNavigator.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/DateTimeNavigator.js index 8e74281cc4a..2bb618429d5 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/DateTimeNavigator.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/DateTimeNavigator.js @@ -1,6 +1,6 @@ import Flatpickr from "react-flatpickr"; import {Button} from "primereact/button"; -import React, {useEffect, useState} from "react"; +import {useEffect, useState} from "react"; import DateTimeInfo from "./DateTimeInfo"; import moment from "moment"; import UIConstants from "../../../../utils/ui.constants"; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/ZoomAndMove.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/ZoomAndMove.js index 75811830ea5..2d34a0bb0b9 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/ZoomAndMove.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/components/toolbar/ZoomAndMove.js @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import { updateStore } from "../../../../services/store.helper"; import { ProgressSpinner } from 'primereact/progressspinner'; import UIConstants from "../../../../utils/ui.constants"; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/timeline.renderer.helper.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/timeline.renderer.helper.js index b98bc49efb7..77b1d208849 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/timeline.renderer.helper.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/helpers/timeline.renderer.helper.js @@ -1,4 +1,4 @@ -import React from "react"; + function getItemDivStyle(itemContext, item, hasItemColors = false) { const style = { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/done.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/done.js index 3e237f6d501..ba8d5054d9c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/done.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/done.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { Link } from 'react-router-dom'; class Done extends Component { @@ -13,6 +13,6 @@ return( </div> </> ) -}; +} } export default Done \ No newline at end of file diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js index 1149e751130..81c1664f74e 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import { useEffect, useState } from 'react'; import {Steps} from 'primereact/steps'; import PageHeader from '../../layout/components/PageHeader'; import {Toast} from 'primereact/toast'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/ingesting.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/ingesting.js index 8c5b5540106..1a74f72d58a 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/ingesting.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/ingesting.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { Button } from 'primereact/button'; class Ingesting extends Component { @@ -47,7 +47,7 @@ class Ingesting extends Component { </> ) - }; + } } export default Ingesting \ No newline at end of file diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js index fbaf89d2111..7a3f00c73e9 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/qa.reporting.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { Button } from 'primereact/button'; import { Dialog } from 'primereact/dialog'; import SunEditor from 'suneditor-react'; @@ -457,6 +457,6 @@ class QAreporting extends Component{ } </> ) -}; +} } export default QAreporting; \ No newline at end of file diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js index bca4d12e4c2..13bbf25cebd 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/task.assigner.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import { Component } from 'react'; import { Dropdown } from 'primereact/dropdown'; import WorkflowService from '../../services/workflow.service'; import { Link } from 'react-router-dom'; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js index cfdab751d06..b9e6a29287c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js @@ -1,4 +1,3 @@ -import React from 'react'; import { Switch, // Redirect, diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js index 549f663b50f..57be9e4d016 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js @@ -81,7 +81,7 @@ const ReservationService = { } catch(error) { console.error(error); return null; - }; + } }, getReservationTemplate: async function(templateId) { try { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js index 16a898a4f20..8bfa88acb9c 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/services/schedule.service.js @@ -834,9 +834,7 @@ const ScheduleService = { } const response = await axios.get(url); return response.data.results; - } catch (error) { - - } + } catch (error) { /* empty */ } }, /* Create Task Relation based on consumer(Ingest) and producer */ createTaskRelation: async function (taskRelDraftObj, obj, type) { diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js index fb5269d8edc..1a2d1820495 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js @@ -259,9 +259,7 @@ const TaskService = { try { return (await axios.get(`/api/subtask_type`)).data.results; - } catch(error) { - - } + } catch(error) { /* empty */ } }, /** * Delete task based on task type diff --git a/SAS/TMSS/frontend/tmss_webapp/src/show.error.details.js b/SAS/TMSS/frontend/tmss_webapp/src/show.error.details.js index 3cc95c78881..12ba84576e2 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/show.error.details.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/show.error.details.js @@ -1,4 +1,4 @@ -import React, {Component} from 'react'; +import {Component} from 'react'; import UIConstants from './utils/ui.constants'; import { Toast } from 'primereact/toast'; -- GitLab