Merge pull request #3470 from OneCommunityGlobal/development

Frontend Release to Main [4.13]

Author: one-community

.eslintignore

@@ -11,15 +11,8 @@
 /build/
 
 # Ignore test files inside /src/components
-src/__tests__/**
-/src/components/**/__test__/**/*
-/src/components/**/__tests__/**/*
-/src/reducers/**/__tests__/**/*
-
 src/components/BMDashboard/_tests_/BMDashboard.test.jsx
-src/components/Login/ForgotPassword.test.jsx
-src/components/Login/LoginPage.test.js
-src/components/PermissionsManagement/PermissionsManagement.test.js
+src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx
 
 # Ignore folders in /src
 src/components/Badge/**

package-lock.json

@@ -11,6 +11,7 @@
     "@fortawesome/free-regular-svg-icons": "^5.12.1",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.1.19",
+    "@react-leaflet/core": ">=1.0.0 <1.1.0",
     "@sentry/browser": "^4.6.6",
     "@tinymce/tinymce-react": "^3.14.0",
     "axios": "^0.21.2",
@@ -30,7 +31,10 @@
     "html-to-pdfmake": "^2.0.6",
     "joi": "^14.0.6",
     "jwt-decode": "^2.2.0",
+    "leaflet": "1.7.1",
+    "leaflet.heat": "^0.2.0",
     "lodash": "^4.17.21",
+    "lucide-react": "^0.484.0",
     "lz-string": "^1.5.0",
     "moment": "^2.29.2",
     "moment-timezone": "^0.5.33",
@@ -43,15 +47,13 @@
     "react-chartjs-2": "^5.2.0",
     "react-circular-progressbar": "^2.1.0",
     "react-collapsible": "^2.10.0",
-    "react-datepicker": "^3.7.0",
+    "react-datepicker": "^3.8.0",
     "react-day-picker": "^7.4.8",
     "react-dom": "^16.13.1",
     "react-html-parser": "^2.0.2",
     "react-icons": "^4.3.1",
     "react-input-range": "^1.3.0",
     "react-leaflet": ">=3.1.0 <3.2.0",
-    "@react-leaflet/core": ">=1.0.0 <1.1.0",
-    "leaflet": "1.7.1",
     "react-leaflet-cluster": "^1.0.4",
     "react-multi-select-component": "^4.0.2",
     "react-phone-input-2": "^2.14.0",

package.json

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-unused-vars
 import React from 'react';
 import moment from 'moment';
 import { render, screen, waitFor } from '@testing-library/react';

src/__tests__/CountdownTimer.test.js

@@ -1,21 +1,25 @@
 // This is needed to remove a warning related to popper.js when testing reactstrap tooltips.
 // More on this bug: https://github.com/react-bootstrap/react-bootstrap/issues/4997
-
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-env jest */
 import PopperJs from 'popper.js';
 
-export default class Popper {
-  static placements = PopperJs.placements;
+// export default class Popper {
+//  static placements = PopperJs.placements;
 
-  constructor() {
+  function Popper() {
     return {
       destroy: () => {},
       scheduleUpdate: () => {},
     };
   }
-}
+  // To mimic static property
+  Popper.placements = PopperJs.placements;
+  export default Popper;
+
 
-describe('Stop Error', () => {
-  it('should not error out due to no tests (popper.js.js)', () => {
-    return;
+  describe('Stop Error', () => {
+   it('should not error out due to no tests (popper.js.js)', () => {
+    
   });
 });

src/__tests__/__mocks__/popper.js.js

@@ -1,3 +1,4 @@
+/* eslint-env jest */
 test('it should pass', () => {
   expect(true).toBe(true);
 });

src/__tests__/__mocks__/react-leaflet-cluster.js

@@ -1,3 +1,4 @@
+/* eslint-env jest */
 test('it should pass', () => {
   expect(true).toBe(true);
 });

src/__tests__/__mocks__/react-leaflet.js

@@ -1,4 +1,4 @@
-let dt = new Date();
+const dt = new Date();
 dt.setDate(dt.getDate() + 1);
 
 export default {
@@ -1810,6 +1810,8 @@ export default {
     }
   };
 
+// eslint-disable-next-line no-undef
 describe('Stop Error', () => {
+  // eslint-disable-next-line no-undef
   it('should not error out due to no tests  (mockAdminState.js)', () => {});
 });

src/__tests__/mockAdminState.js

@@ -1,4 +1,4 @@
-import { getAllPermissionKeys } from '../components/PermissionsManagement/PermissionsConst.js';
+import { getAllPermissionKeys } from '../components/PermissionsManagement/PermissionsConst';
 
 export const allTeamsMock = {
   fetching: false,
@@ -1302,7 +1302,9 @@ export const rolesMock = {
   }
 }
 
+// eslint-disable-next-line no-undef
 describe('Stop Error', () => {
+  // eslint-disable-next-line no-undef
   it('should not error out due to no tests (mockStates.js)', () => { });
 });
 
@@ -1313,7 +1315,7 @@ const allPermissionsExcept = (permissions) => {
 
 // takes a list of relevant permissions and returns two auth objects, one with the permissions and the other with all permissions not listed
 export const createAuthMocks = (permissions) => {
-  var authTemplate = {
+  const authTemplate = {
     // isAdmin: true,
     user: {
       userid: '5edf141c78f1380017b829a6',

src/__tests__/mockStates.js

@@ -1,5 +1,6 @@
-import { createAuthMocks } from "./mockStates";
+// eslint-disable-next-line no-unused-vars
 import { getAllPermissionKeys } from "components/PermissionsManagement/PermissionsConst"; 
+import { createAuthMocks } from "./mockStates";
 
 describe('Permission tests', () => {
   it('should include specific permission', () => {