Fixing errors and formatting

Author: jeffersoncasimir

modules/dataquery/jsx/definefilters.addfiltermodal.tsx

@@ -185,8 +185,8 @@ function AddFilterModal(props: {
               '<italic>at least one</italic> of the data points.'
             }
             ns="dataquery"
-            values={{ scope: fieldDictionary.scope}}
-            components={{italic: <i/>,}}
+            values={{scope: fieldDictionary.scope}}
+            components={{italic: <i/>}}
           />
         </div>
       </div>;

modules/dataquery/jsx/definefilters.tsx

@@ -378,10 +378,10 @@ function DefineFilters(props: {
       <Trans
         i18nKey="Query matches <bold>{{count}}</bold> candidates"
         ns="dataquery"
-        values={{ count: queryMatches}}
-        components={{bold: <b/>,}}
+        values={{count: queryMatches}}
+        components={{bold: <b/>}}
       />
-  </div>;
+    </div>;
   return (<div>
     {modal}
     {csvModalHTML}

modules/dataquery/jsx/index.tsx

@@ -18,7 +18,6 @@ import {useDataDictionary, useCategories} from './hooks/usedatadictionary';
 import {ModuleDictionary, DictionaryCategory} from './types';
 // @ts-ignore
 import i18n from 'I18nSetup';
-import {withTranslation} from 'react-i18next';
 
 import hiStrings from '../locale/hi/LC_MESSAGES/dataquery.json';
 
@@ -250,8 +249,6 @@ function DataQueryApp(props: {
 declare const loris: any;
 window.addEventListener('load', () => {
   i18n.addResourceBundle('hi', 'dataquery', hiStrings);
-  const TranslatedDataQueryApp = withTranslation(
-    ['dataquery', 'loris'])(DataQueryApp);
 
   const element = document.getElementById('lorisworkspace');
   if (!element) {
@@ -260,7 +257,7 @@ window.addEventListener('load', () => {
   const root = createRoot(element);
 
   root.render(
-    <TranslatedDataQueryApp
+    <DataQueryApp
       queryAdmin={loris.userHasPermission('dataquery_admin')}
       username={loris.user.username}
     />,

modules/dataquery/jsx/welcome.tsx

@@ -13,12 +13,7 @@ import {APIQueryField} from './types';
 import {FullDictionary} from './types';
 import {FlattenedField, FlattenedQuery, VisitOption} from './types';
 import {useTranslation} from 'react-i18next';
-// @ts-ignore
-import i18n from 'I18nSetup';
-import {withTranslation} from 'react-i18next';
-import {createRoot} from 'react-dom/client';
-
-import hiStrings from '../locale/hi/LC_MESSAGES/dataquery.json';
+import 'I18nSetup';
 
 /**
  * Return the welcome tab for the DQT

tsconfig.json

@@ -18,6 +18,5 @@
       "es6", "dom", "es2017"
     ],
     "strict" : true,
-    "resolveJsonModule": true
   }
 }