Prettify frontend codebase

frontend/src/index.ts

@@ -37,7 +37,7 @@ const environment = {
     : isProduction
     ? ""
     : MOCK_API_URL,
-  disableLogin,
+  disableLogin
 };
 
 const tabs = [StandardQueryEditorTab, TimebasedQueryEditorTab, FormsTab];

frontend/src/js/AppRoot.tsx

@@ -7,8 +7,8 @@ import type { TabT } from "./pane/types";
 import AppRouter from "./app/AppRouter";
 
 type PropsType = {
-  store: Object;
-  browserHistory: Object;
+  store: Record<string, any>;
+  browserHistory: Record<string, any>;
   rightTabs: TabT[];
 };
 

frontend/src/js/api/api.ts

@@ -19,15 +19,15 @@ import type {
   PostLoginResponseT,
   PostFormConfigsResponseT,
   GetFormConfigsResponseT,
-  GetFormConfigResponseT,
+  GetFormConfigResponseT
 } from "./types";
 
 import fetchJson, { fetchJsonUnauthorized } from "./fetchJson";
 import { transformQueryToApi } from "./apiHelper";
 import { transformFormQueryToApi } from "./apiExternalFormsHelper";
 import type {
   FormConfigT,
-  BaseFormConfigT,
+  BaseFormConfigT
 } from "js/external-forms/form-configs/reducer";
 
 const PROTECTED_PREFIX = "/api";
@@ -62,15 +62,15 @@ export const getConcept = (
 // Same signature as postFormQueries
 export function postQueries(
   datasetId: DatasetIdT,
-  query: Object,
+  query: Record<string, any>,
   queryType: string
 ): Promise<PostQueriesResponseT> {
   // Transform into backend-compatible format
   const data = transformQueryToApi(query, queryType);
 
   return fetchJson(getProtectedUrl(`/datasets/${datasetId}/queries`), {
     method: "POST",
-    data,
+    data
   });
 }
 
@@ -87,7 +87,7 @@ export function postFormQueries(
 
   return fetchJson(getProtectedUrl(`/datasets/${datasetId}/queries`), {
     method: "POST",
-    data,
+    data
   });
 }
 
@@ -98,7 +98,7 @@ export function deleteQuery(
   return fetchJson(
     getProtectedUrl(`/datasets/${datasetId}/queries/${queryId}`),
     {
-      method: "DELETE",
+      method: "DELETE"
     }
   );
 }
@@ -140,21 +140,21 @@ export function deleteStoredQuery(
   return fetchJson(
     getProtectedUrl(`/datasets/${datasetId}/stored-queries/${queryId}`),
     {
-      method: "DELETE",
+      method: "DELETE"
     }
   );
 }
 
 export function patchStoredQuery(
   datasetId: DatasetIdT,
   queryId: QueryIdT,
-  attributes: Object
+  attributes: Record<string, any>
 ): Promise<null> {
   return fetchJson(
     getProtectedUrl(`/datasets/${datasetId}/stored-queries/${queryId}`),
     {
       method: "PATCH",
-      data: attributes,
+      data: attributes
     }
   );
 }
@@ -172,7 +172,7 @@ export function postPrefixForSuggestions(
     ),
     {
       method: "POST",
-      data: { text },
+      data: { text }
     }
   );
 }
@@ -186,7 +186,7 @@ export function postConceptsListToResolve(
     getProtectedUrl(`/datasets/${datasetId}/concepts/${conceptId}/resolve`),
     {
       method: "POST",
-      data: { concepts },
+      data: { concepts }
     }
   );
 }
@@ -204,7 +204,7 @@ export function postFilterValuesResolve(
     ),
     {
       method: "POST",
-      data: { values },
+      data: { values }
     }
   );
 }
@@ -221,8 +221,8 @@ export function postLogin(
     method: "POST",
     data: {
       user,
-      password,
-    },
+      password
+    }
   });
 }
 
@@ -232,7 +232,7 @@ export function postFormConfig(
 ): Promise<PostFormConfigsResponseT> {
   return fetchJson(getProtectedUrl(`/datasets/${datasetId}/form-configs`), {
     method: "POST",
-    data,
+    data
   });
 }
 
@@ -254,7 +254,7 @@ export function patchFormConfig(
     getProtectedUrl(`/datasets/${datasetId}/form-configs/${formConfigId}`),
     {
       method: "PATCH",
-      data,
+      data
     }
   );
 }
@@ -272,7 +272,7 @@ export function deleteFormConfig(
   return fetchJson(
     getProtectedUrl(`/datasets/${datasetId}/form-configs/${formConfigId}`),
     {
-      method: "DELETE",
+      method: "DELETE"
     }
   );
 }

frontend/src/js/api/apiExternalFormsHelper.ts

@@ -5,7 +5,7 @@ export const transformFormQueryToApi = (
   query: { form: string; formName: string },
   queryType: string,
   formQueryTransformation: Function
-): Object => {
+): Record<string, any> => {
   const { form, formName } = query;
 
   return {

frontend/src/js/api/apiHelper.ts

@@ -188,7 +188,10 @@ const createExternal = (query: any) => {
 // The query state already contains the query.
 // But small additions are made (properties whitelisted), empty things filtered out
 // to make it compatible with the backend API
-export const transformQueryToApi = (query: Object, queryType: string) => {
+export const transformQueryToApi = (
+  query: Record<string, any>,
+  queryType: string
+) => {
   switch (queryType) {
     case "timebased":
       return transformTimebasedQueryToApi(query);

frontend/src/js/api/fetchJson.ts

@@ -4,7 +4,7 @@ import { getStoredAuthToken } from "../authorization/helper";
 export async function fetchJsonUnauthorized(
   url: string,
   request?: Partial<AxiosRequestConfig>,
-  rawBody: boolean = false
+  rawBody = false
 ) {
   const finalRequest: AxiosRequestConfig = request
     ? {
@@ -50,7 +50,7 @@ export async function fetchJsonUnauthorized(
 function fetchJson(
   url: string,
   request?: Partial<AxiosRequestConfig>,
-  rawBody: boolean = false
+  rawBody = false
 ) {
   const authToken = getStoredAuthToken() || "";
   const finalRequest = {

frontend/src/js/app/AppRouter.tsx

@@ -8,7 +8,7 @@ import WithAuthToken from "../authorization/WithAuthToken";
 import App from "./App";
 
 type PropsType = {
-  history: Object;
+  history: Record<string, any>;
   rightTabs: TabT[];
 };
 

frontend/src/js/app/LeftPane.tsx

@@ -12,10 +12,10 @@ import { StateT } from "./reducers";
 
 const LeftPane = () => {
   const activeTab = useSelector<StateT, string>(
-    (state) => state.panes.left.activeTab
+    state => state.panes.left.activeTab
   );
   const selectedDatasetId = useSelector<StateT, DatasetIdT | null>(
-    (state) => state.datasets.selectedDatasetId
+    state => state.datasets.selectedDatasetId
   );
 
   return (

frontend/src/js/app/reducers.ts

@@ -13,34 +13,34 @@ import startup, { StartupStateT } from "../startup/reducer";
 import { buildPanesReducer, PanesStateT } from "../pane/reducer";
 import queryGroupModal from "../query-group-modal/reducer";
 import previousQueries, {
-  PreviousQueriesStateT,
+  PreviousQueriesStateT
 } from "../previous-queries/list/reducer";
 import previousQueriesSearch, {
-  PreviousQueriesSearchStateT,
+  PreviousQueriesSearchStateT
 } from "../previous-queries/search/reducer";
 import previousQueriesFilter, {
-  PreviousQueriesFilterStateT,
+  PreviousQueriesFilterStateT
 } from "../previous-queries/filter/reducer";
 import uploadQueryResults from "../previous-queries/upload/reducer";
 import deletePreviousQueryModal from "../previous-queries/delete-modal/reducer";
 import snackMessage from "../snack-message/reducer";
 import preview from "../preview/reducer";
 import queryUploadConceptListModal from "../query-upload-concept-list-modal/reducer";
 import uploadConceptListModal, {
-  UploadConceptListModalStateT,
+  UploadConceptListModalStateT
 } from "../upload-concept-list-modal/reducer";
 
 import { createQueryNodeEditorReducer } from "../query-node-editor/reducer";
 
 import type { StandardQueryEditorStateT } from "../standard-query-editor";
 import formConfigs, {
-  FormConfigsStateT,
+  FormConfigsStateT
 } from "../external-forms/form-configs/reducer";
 import formConfigsSearch, {
-  FormConfigsSearchStateT,
+  FormConfigsSearchStateT
 } from "../external-forms/form-configs/search/reducer";
 import formConfigsFilter, {
-  FormConfigsFilterStateT,
+  FormConfigsFilterStateT
 } from "../external-forms/form-configs/filter/reducer";
 
 // TODO: Introduce more StateTypes gradually
@@ -86,7 +86,7 @@ const buildAppReducer = (tabs: TabT[]) => {
     ...tabs.reduce((all, tab) => {
       all[tab.key] = tab.reducer;
       return all;
-    }, {}),
+    }, {})
   });
 };
 

frontend/src/js/authorization/WithAuthToken.tsx

@@ -7,7 +7,7 @@ import { useDispatch } from "react-redux";
 type PropsType = {
   children: React.ReactNode;
   location: {
-    search: Object;
+    search: Record<string, any>;
   };
 };
 

frontend/src/js/authorization/middleware.ts

@@ -4,7 +4,7 @@ import { isLoginDisabled } from "../environment";
 export function createUnauthorizedErrorMiddleware() {
   const loginDisabled = isLoginDisabled();
 
-  return (store: Object) => (next: Function) => (action: any) => {
+  return (store: Record<string, any>) => (next: Function) => (action: any) => {
     if (!loginDisabled && action.payload && action.payload.status === 401)
       store.dispatch(push("/login"));
 

frontend/src/js/button/PreviewButton.tsx

@@ -8,10 +8,10 @@ import { openPreview } from "../preview/actions";
 import IconButton from "./IconButton";
 
 type PropsType = {
-  url: string,
-  isLoading: boolean,
-  onOpenPreview: (url: string) => void,
-  className?: string
+  url: string;
+  isLoading: boolean;
+  onOpenPreview: (url: string) => void;
+  className?: string;
 };
 
 const PreviewButton = ({

frontend/src/js/common/actions/genericActions.ts

@@ -14,26 +14,26 @@ interface ErrorObject {
 export const defaultError = (
   type: string,
   error: ErrorObject,
-  payload?: Object
+  payload?: Record<string, any>
 ): ActionT => ({
   type,
   error: true,
   payload: {
     message: error.message,
     status: error.status,
-    ...payload,
-  },
+    ...payload
+  }
 });
 
 export const defaultSuccess = (
   type: string,
   results: any,
-  payload?: Object
+  payload?: Record<string, any>
 ): ActionT => ({
   type,
   payload: {
     data: results,
     receivedAt: Date.now(),
-    ...payload,
-  },
+    ...payload
+  }
 });

frontend/src/js/common/helpers/commonHelper.ts

@@ -8,7 +8,7 @@ export const compose = (...fns: Function[]) =>
     v => v
   );
 
-export const objectWithoutKey = (key: string) => (obj: Object) => {
+export const objectWithoutKey = (key: string) => (obj: Record<string, any>) => {
   if (!obj.hasOwnProperty(key)) return obj;
 
   const { [key]: deleted, ...rest } = obj;
@@ -69,7 +69,7 @@ export const toUpperCaseUnderscore = (str: string) => {
 export const isObject = (item: any) =>
   item && typeof item === "object" && !Array.isArray(item);
 
-export const mergeDeep = (...elements: Object[]) => {
+export const mergeDeep = (...elements: Record<string, any>[]) => {
   return elements.filter(isObject).reduce((aggregate, current) => {
     const nonObjectKeys = Object.keys(current).filter(
       key => !isObject(current[key])