fix: fix SonarQube errors

Author: jorilindell

src/actions/index.ts

@@ -21,7 +21,7 @@ export const fetchResource = createAction(
   ActionTypes.GET_RESOURCE,
   ApiClient.fetchResource,
   (resourceType: string, filters?: any, include?: string[], embed?: string[], meta?: any) => {
-    return Object.assign({}, meta, { resourceType });
+    return { ...meta, resourceType };
   }
 );
 

src/actions/queueHandler.js

@@ -32,7 +32,7 @@ export default function queueHandler(store) {
       markAndSendObservation(store, item);
     });
 
-    const shouldRetryImmediately = ((opts && opts.initial === true) || store.getState().updateFlush);
+    const shouldRetryImmediately = ((opts?.initial === true) || store.getState().updateFlush);
     if (shouldRetryImmediately) {
       _.each(timers, (_, key) => {
         clearTimeout(key);

src/components/LoginScreen.js

@@ -34,11 +34,10 @@ class LoginScreen extends React.Component {
   }
   handleChange(field) {
     return (event) => {
-      this.setState(
-        Object.assign(
-          this.state,
-          {[field]: event.target.value}
-        ));
+      this.setState(prevState => ({
+        ...prevState,
+        [field]: event.target.value
+      }));
     };
   }
   render() {

src/components/NotFound.tsx

@@ -7,7 +7,7 @@ const NotFound: React.FC = () => {
       <div className="list-group facility-return clearfix">
         <Link to="/" className="list-group-item">
           <span className="action-icon glyphicon glyphicon-chevron-left"></span>
-          Takaisin
+          {' '}Takaisin
         </Link>
       </div>
       <h4>404 - Sivua ei löytynyt</h4>

src/components/UnitDetails.tsx

@@ -30,7 +30,7 @@ interface ObservablePropertyPanelProps {
   header: string;
 }
 
-export function ObservableProperty({ quality, property, identifier, name, unitId }: ObservablePropertyProps): React.ReactElement {
+export function ObservableProperty({ quality, property, identifier, name, unitId }: Readonly<ObservablePropertyProps>): React.ReactElement {
   const url = `/unit/${unitId}/update/${property}/${identifier}`;
   const color = COLORS[quality] || 'primary';
   const icon = ICONS[identifier];
@@ -40,7 +40,7 @@ export function ObservableProperty({ quality, property, identifier, name, unitId
   return <Link to={url} className={buttonClassName}><span className={iconClassName}></span><br />{name.fi}</Link>;
 }
 
-export function ObservablePropertyPanel({ allowedValues, header }: ObservablePropertyPanelProps): React.ReactElement {
+export function ObservablePropertyPanel({ allowedValues, header }: Readonly<ObservablePropertyPanelProps>): React.ReactElement {
   const amountOfValues = allowedValues.length;
   const cutPoint = (amountOfValues / 2) + (amountOfValues % 2);
   const left = allowedValues.slice(0, cutPoint);
@@ -65,7 +65,7 @@ export function ObservablePropertyPanel({ allowedValues, header }: ObservablePro
 
 const UnitDetails: React.FC = () => {
   const params = useParams<{ unitId: string }>();
-  const unitId = params.unitId!;
+  const unitId = params.unitId;
 
   const unit = useSelector((state: RootState) => state.data.unit[unitId]);
   const isLoading = useSelector((state: RootState) => state.data.loading.unit === true);

src/components/UnitHistory.js

@@ -37,7 +37,7 @@ class UnitHistory extends React.Component {
           <div className="list-group facility-return clearfix">
             <Link to={`/unit/${unit.id}`} className="list-group-item">
               <span className="action-icon glyphicon glyphicon-chevron-left"></span>
-                    Takaisin
+              {' '}Takaisin
             </Link>
           </div>
           <div className="well">

src/components/UnitList.tsx

@@ -11,7 +11,7 @@ interface UnitListElementProps {
   unit: Unit;
 }
 
-export function UnitListElement(props: UnitListElementProps): React.ReactElement {
+export function UnitListElement(props: Readonly<UnitListElementProps>): React.ReactElement {
   const { unit } = props;
   const url = `/unit/${unit.id}`;
   let iconClassName: string;

src/reducers/index.ts

@@ -113,27 +113,25 @@ const authErrorReducer: Reducer<AuthErrorState, ReduxAction> = (state = initialA
 };
 
 const authReducer: Reducer<AuthState, ReduxAction> = (state = initialAuthState, action) => {
-  switch (action.type) {
-    case ActionTypes.LOGIN: {
-      const loginAction = action as LoginAction;
-      if (loginAction.error) {
-        return {
-          token: null,
-          maintenance_organization: null,
-          login_id: null
-        };
-      }
-      const {maintenance_organization, token, login_identifier} = loginAction.payload;
-      
+  if (action.type === ActionTypes.LOGIN) {
+    const loginAction = action as LoginAction;
+    if (loginAction.error) {
       return {
-        maintenance_organization,
-        token,
-        login_id: login_identifier
+        token: null,
+        maintenance_organization: null,
+        login_id: null
       };
     }
-    default:
-      return state;
+    const {maintenance_organization, token, login_identifier} = loginAction.payload;
+    
+    return {
+      maintenance_organization,
+      token,
+      login_id: login_identifier
+    };
   }
+  
+  return state;
 };
 
 function observationPath({unitId, property}: {unitId: string; property: string}): string {
@@ -234,66 +232,60 @@ const updateFlushReducer: Reducer<boolean, ReduxAction> = (state = manuallyFlush
 };
 
 const serviceGroupReducer: Reducer<string, ReduxAction> = (state = serviceGroup, action) => {
-  switch (action.type) {
-    case ActionTypes.SELECT_SERVICE_GROUP:
-      return (action as SelectServiceGroupAction).payload;
-    default:
-      return state;
+  if (action.type === ActionTypes.SELECT_SERVICE_GROUP) {
+    return (action as SelectServiceGroupAction).payload;
   }
+  
+  return state;
 };
 
 const initialUserLocation: any = null;
 
 const userLocationReducer: Reducer<any, ReduxAction> = (state = initialUserLocation, action) => {
-  switch (action.type) {
-    case ActionTypes.SET_USER_LOCATION:
-      return (action as SetUserLocationAction).payload;
-    default:
-      return state;
+  if (action.type === ActionTypes.SET_USER_LOCATION) {
+    return (action as SetUserLocationAction).payload;
   }
+  
+  return state;
 };
 
 const initialUnitsByUpdateTime: string[] = [];
 const unitsByUpdateTimeReducer: Reducer<string[], ReduxAction> = (state = initialUnitsByUpdateTime, action) => {
-  switch (action.type) {
-    case ActionTypes.POST_OBSERVATION: {
-      const postAction = action as PostObservationAction;
-      
-      if (postAction.error === true) {
-        return state;
-      }
-      
-      return _.uniq([postAction.meta.unitId, ...state]).slice(0, 20);
-    }
-    default:
+  if (action.type === ActionTypes.POST_OBSERVATION) {
+    const postAction = action as PostObservationAction;
+    
+    if (postAction.error === true) {
       return state;
+    }
+    
+    return _.uniq([postAction.meta.unitId, ...state]).slice(0, 20);
   }
+  
+  return state;
 };
 
 const initialUnitsByUpdateCount: UnitsByUpdateCountState = {};
 const unitsByUpdateCountReducer: Reducer<UnitsByUpdateCountState, ReduxAction> = (
   state = initialUnitsByUpdateCount,
   action
 ) => {
-  switch (action.type) {
-    case ActionTypes.POST_OBSERVATION: {
-      const postAction = action as PostObservationAction;
-
-      if (postAction.error === true) {
-        return state;
-      }
+  if (action.type === ActionTypes.POST_OBSERVATION) {
+    const postAction = action as PostObservationAction;
 
-      const { unitId } = postAction.meta;
-      const existingCount = (state[unitId] || {}).count || 0;
-      
-      return {
-        ...state,
-        [unitId]: { count: existingCount + 1, id: unitId }
-      };
-    }
-    default:
+    if (postAction.error === true) {
       return state;
+    }
+
+    const { unitId } = postAction.meta;
+    const existingCount = state[unitId]?.count || 0;
+    
+    return {
+      ...state,
+      [unitId]: { count: existingCount + 1, id: unitId }
+    };
   }
+  
+  return state;
 };
 
 export default combineReducers({

src/reducers/types.ts

@@ -1,4 +1,4 @@
-import { Action, AnyAction } from 'redux';
+import { Action } from 'redux';
 import { ActionTypes } from '../constants';
 import { Unit, ObservableProperty } from '../types';
 
@@ -86,8 +86,7 @@ export type ReduxAction =
   | PostObservationAction
   | FlushUpdateQueueAction
   | SelectServiceGroupAction
-  | SetUserLocationAction
-  | AnyAction;
+  | SetUserLocationAction;
 
 // Common data interfaces
 
@@ -139,7 +138,7 @@ export interface RootState {
   updateQueue: PendingObservationsState;  // Note: renamed from pendingObservations in actual store
   updateFlush: boolean;
   serviceGroup: string;
-  userLocation: any | null;
+  userLocation: any;
   unitsByUpdateTime: string[];
   unitsByUpdateCount: UnitsByUpdateCountState;
 }

src/util/error.js

@@ -2,7 +2,7 @@
 export function CredentialError(message) {
   this.name = 'CredentialError';
   this.message = message;
-  this.stack = (new Error()).stack;
+  this.stack = (new Error(message)).stack;
 }
 
-CredentialError.prototype = new Error;
+CredentialError.prototype = new Error('CredentialError');