chore: merged in master branch

Author: nicoalee

.gitignore

@@ -102,7 +102,6 @@ ENV/
 
 # Spyder project settings
 .spyderproject
-.vscode
 
 # Rope project settings
 .ropeproject

compose/neurosynth-frontend/.babelrc

@@ -154,24 +154,30 @@ describe('ExtractionTable', () => {
             });
         });
 
-        it('should remove the filter if the delete button is clicked', () => {
+        it.only('should remove the filter if the delete button is clicked', () => {
+            let studysetYear = '';
             // ARRANGE
             cy.wait('@studysetFixture').then((studysetFixture) => {
                 const studyset = studysetFixture?.response?.body as StudysetReturn;
                 const studysetStudies = studyset.studies as StudyReturn[];
+                studysetYear = studysetStudies[0].year?.toString() || "";
                 cy.get('input').eq(0).click();
                 cy.get(`input`)
                     .eq(0)
                     .type(studysetStudies[0].year?.toString() || '');
             });
             cy.get('tbody > tr').should('have.length', 1);
-            cy.get('[data-testid="CancelIcon"]').should('exist');
+
             // ACT
-            cy.get('[data-testid="CancelIcon"]').click();
+            cy.contains(
+                `Filtering YEAR: ${studysetYear}`
+            ).parent().find('[data-testid="CancelIcon"]').click();
 
             // ASSERT
             cy.get('tbody > tr').should('have.length', 3);
-            cy.get(`[data-testid="CancelIcon"]`).should('not.exist');
+            cy.contains(
+                `Filtering YEAR: ${studysetYear}`
+            ).should('not.exist')
         });
     });
 

compose/neurosynth-frontend/cypress/e2e/workflows/Extraction/ExtractionTable.cy.tsx

@@ -422,7 +422,7 @@ describe('DoSleuthImport', () => {
 
         it('should select MKDA and create an MKDA meta analysis', () => {
             cy.contains('button', 'Yes').click();
-            cy.get('[type="radio"]').eq(1).click();
+            cy.get('[type="radio"]').eq(1).click({ force: true });
             cy.contains('button', 'create')
                 .click()
                 .wait('@specificationPostFixture')

compose/neurosynth-frontend/cypress/e2e/workflows/SleuthImport/DoSleuthImport.cy.tsx

@@ -1,22 +1,38 @@
-module.exports = {
-    root: true,
-    env: { browser: true, es2020: true },
-    extends: [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:react-hooks/recommended",
-        "prettier",
-        "plugin:cypress/recommended",
-    ],
-    plugins: ["@typescript-eslint", "prettier"],
-    ignorePatterns: ["dist", ".eslintrc"],
-    parser: "@typescript-eslint/parser",
-    rules: {
-        "react-refresh/only-export-components": [
-            "warn",
-            { allowConstantExport: true },
-        ],
-        indent: "off",
-        "prettier/prettier": 4,
+import tsParser from '@typescript-eslint/parser';
+import eslint from '@eslint/js';
+import teslint from 'typescript-eslint';
+import eslintHooks from 'eslint-plugin-react-hooks';
+import eslintCypress from 'eslint-plugin-cypress/flat';
+import eslintPrettier from 'eslint-plugin-prettier/recommended';
+import globals from 'globals';
+import eslintReactRefresh from 'eslint-plugin-react-refresh';
+
+export default [
+    eslint.configs.recommended,
+    ...teslint.configs.recommended,
+    eslintCypress.configs.recommended,
+    eslintPrettier,
+    {
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+            },
+            parser: tsParser,
+            parserOptions: {
+                ecmaFeatures: {
+                    modules: true,
+                },
+                ecmaVersion: 2020,
+                project: './tsconfig.json',
+            },
+        },
+        plugins: {
+            'react-hooks': eslintHooks,
+            'react-refresh': eslintReactRefresh,
+        },
+        rules: {
+            ...eslintHooks.configs.recommended.rules,
+            'react-refresh/only-export-components': 'warn',
+        },
     },
-};
+];