Merge branch 'main' into dependabot/npm_and_yarn/frontend/cross-spawn…

…-7.0.6

.github/pull_request_template.md

@@ -1,11 +1,10 @@
-[Plain-text summary description of the solution]
+[Plain-text summary description of the solution. Include any class updates, new or edited functions, significant changes to UX, etc]
 
 PR fixes #[REPLACE WITH ISSUE NUMBER]
 
-**Changes**
-- [bullet list include any model updates]
-- [new or edited functions]
-- [significant changes to UX]
-- [design decisions, especially if architectural patterns are new/altered]
-- [can use text, screenshots, or files]
-- [a callout of any ##TODO or ##FIXMEs found/created as part of the fix]
+**Before you Submit!**
+* Is all the text internationalized?
+* If you made a change to the header, did you update the react, jsp, and html?
+* Are all depedencies at a locked version?
+* Did you adhere to [best practices](https://wildbook.docs.wildme.org/contribute/code-guide.html)?
+* Is there a quick [unit test](https://wildbook.docs.wildme.org/contribute/tests.html) you can add?

.github/workflows/dev-maven-publish.yml

@@ -26,7 +26,7 @@ jobs:
         mvn clean install -DskipTests -Dmaven.javadoc.skip=true -B
         mvn -B package --file pom.xml
     - name: Log in to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: wildmeorg
         password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN  }}

.github/workflows/release-maven-publish.yml

@@ -25,7 +25,7 @@ jobs:
         mvn clean install -DskipTests -Dmaven.javadoc.skip=true -B
         mvn -B package --file pom.xml
     - name: Log in to Docker Hub
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         username: wildmeorg
         password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN  }}

.gitignore

@@ -29,6 +29,7 @@ src/main/caribwhale_data_dir
 /node_modules
 .vscode/
 *.swp
+/src/jsp/
 
 src/main/webapp/javascript/dev/MarkedIndividual.json
 src/main/webapp/javascript/dev/Relationship.json

README.md

@@ -49,6 +49,13 @@ The following git commands may prove useful.
 * `git add <filename>: add files that have changes to staging in preparation for commit
 * `git commit`: commits the stagged files, opens a text editor for you to write a commit log
 
+### Unit Tests
+We are working on building up test coverage. Current requirements are:
+* Do not drop the percentage of test coverage (exceptions will be made for large scale changes on case-by-case basis)
+* Do not break existing tests
+
+See [test coverage guidelines](src/test/README.md) for how to develop your tests.
+
 ### Submit PR
 Up to this point, all changes have been done to your local copy of Wildbook. You need to push the new commits to a remote branch to start the PR process.
 

config/indices.sql

@@ -5,11 +5,14 @@
 -- UGH, i guess _IDX (in caps!) should be what we standardize on.  that is what datanucleus does.
 --   to make matters worse, we have some places we named them explicitely in package.jdo (but those should fix themselves?)
 
+BEGIN;
+
 CREATE INDEX IF NOT EXISTS "MEDIAASSET_PARENTID_idx" ON "MEDIAASSET" ("PARENTID");
 CREATE INDEX IF NOT EXISTS "MEDIAASSET_HASHCODE_idx" ON "MEDIAASSET" ("HASHCODE");
 
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_LOCATIONID_idx" ON "ENCOUNTER" ("LOCATIONID");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_STATE_idx" ON "ENCOUNTER" ("STATE");
+CREATE INDEX IF NOT EXISTS "ENCOUNTER_MODIFIED_idx" ON "ENCOUNTER" ("MODIFIED");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_INDIVIDUALID_idx" ON "ENCOUNTER" ("INDIVIDUALID");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_DATEINMILLISECONDS_idx" ON "ENCOUNTER" ("DATEINMILLISECONDS");
 CREATE INDEX IF NOT EXISTS "ENCOUNTER_DECIMALLATITUDE_idx" ON "ENCOUNTER" ("DECIMALLATITUDE");
@@ -45,3 +48,5 @@ CREATE INDEX IF NOT EXISTS "TASK_CREATED_IDX" ON "TASK" ("CREATED");
 
 INSERT INTO "RELATIONSHIP" ("RELATIONSHIP_ID", "MARKEDINDIVIDUALNAME1", "MARKEDINDIVIDUALNAME2", "MARKEDINDIVIDUALROLE1", "MARKEDINDIVIDUALROLE2", "TYPE", "STARTTIME", "ENDTIME") VALUES (0, (SELECT "INDIVIDUALID" FROM "MARKEDINDIVIDUAL" ORDER BY random() LIMIT 1), (SELECT "INDIVIDUALID" FROM "MARKEDINDIVIDUAL" ORDER BY random() LIMIT 1), 'placeholder', 'placeholder', 'placeholder-to-prevent-empty-table', 0, 0);
 
+END;
+

eslint.config.mjs

@@ -3,10 +3,14 @@ import pluginJs from "@eslint/js";
 import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";
 import babelParser from "@babel/eslint-parser";
 import reactHooks from "eslint-plugin-react-hooks";
+import jestPlugin from "eslint-plugin-jest";
 
 export default [
   pluginJs.configs.recommended,
   pluginReactConfig,
+  {
+    ignores: ["**/frontend/build/**", "**/frontend/coverage/**"],
+  },
   {
     files: ["**/*.{js,mjs,cjs,jsx}"],
     plugins: {
@@ -18,16 +22,15 @@ export default [
         process: "readonly",
       },
       parser: babelParser,
-
     },
     settings: {
       react: {
-        version: "detect"
-      }
+        version: "detect",
+      },
     },
 
     rules: {
-      "semi": 2,
+      semi: 2,
       "react/prop-types": 0,
       "jsx-no-bind": 0,
       "react/jsx-no-bind": 0,
@@ -36,35 +39,51 @@ export default [
       "react/destructuring-assignment": 0,
       "react/forbid-prop-types": 0,
       "react/jsx-wrap-multilines": 0,
-      "react/style-prop-object": [2, { "allow": ["FormattedNumber"] }],
+      "react/style-prop-object": [2, { allow: ["FormattedNumber"] }],
       "import/prefer-default-export": 0,
       "function-paren-newline": 0,
       "react/function-component-definition": 0,
       "func-names": 0,
       "no-underscore-dangle": 0,
+      "no-unused-vars": [
+        "error",
+        {
+          vars: "all",
+          args: "after-used",
+          ignoreRestSiblings: false,
+          varsIgnorePattern: "^_",
+          argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+        },
+      ],
       "no-console": 1,
       "prefer-destructuring": 0,
       "operator-linebreak": 0,
-      "indent": 0,
-      "camelcase": 0,
+      indent: 0,
+      camelcase: 0,
       "space-before-function-paren": 0,
       "implicit-arrow-linebreak": 0,
       "nonblock-statement-body-position": 0,
       "react/prefer-stateless-function": 0,
-      "curly": 0,
+      curly: 0,
       "object-curly-newline": 0,
       "prefer-template": 0,
       "arrow-parens": 0,
       "no-param-reassign": 0,
       "no-mixed-operators": 0,
       "no-else-return": 0,
-
     },
   },
   {
-    files: ['frontend/babel.config.js', 'frontend/jest.config.js', 'babel.config.js'],  // Specify the config files
+    files: [
+      "frontend/babel.config.js",
+      "frontend/jest.config.js",
+      "babel.config.js",
+    ], // Specify the config files
     languageOptions: {
       globals: {
+        ...globals.node,
         require: "readonly",
         module: "readonly",
         __dirname: "readonly",
@@ -73,16 +92,23 @@ export default [
     },
   },
   {
-    files: ["**/__tests__/**/*.{js,jsx}", "**/*.test.{js,jsx}"],
+    files: ["**/*.{js,cjs}", "**/scripts/**/*.js"],
     languageOptions: {
       globals: {
-        jest: "readonly",    // Define Jest-specific globals
-        test: "readonly",
-        expect: "readonly",
+        ...globals.node,
       },
     },
+  },
+  {
+    files: ["**/__tests__/**/*.{js,jsx}", "**/*.test.{js,jsx}"],
+    plugins: {
+      jest: jestPlugin,
+    },
+    languageOptions: {
+      globals: jestPlugin.environments.globals.globals,
+    },
     rules: {
-      "react/react-in-jsx-scope": 0,  // Disable React in scope for JSX cuz we are using React 17+
-    }
-  }
-];
+      ...jestPlugin.configs.recommended.rules,
+    },
+  },
+];