remove most of lodash

wri · Nov 14, 2024 · 2ccfdb4 · 2ccfdb4
1 parent 1475f37
commit 2ccfdb4
Show file tree

Hide file tree

Showing 46 changed files with 175 additions and 174 deletions.
diff --git a/components/form/CheckboxGroup.js b/components/form/CheckboxGroup.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import isEqual from 'lodash/isEqual';
+import isEqual from 'react-fast-compare';
 import { injectIntl } from 'react-intl';
 
 import Checkbox from './Checkbox';

diff --git a/components/form/File.js b/components/form/File.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import omit from 'lodash/omit';
+
+import { omit } from 'utils/general';
 
 // Intl
 import { injectIntl } from 'react-intl';

diff --git a/components/form/FmusCheckboxGroup.js b/components/form/FmusCheckboxGroup.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import isEqual from 'lodash/isEqual';
+import isEqual from 'react-fast-compare';
 import { injectIntl } from 'react-intl';
 
 // Utils

diff --git a/components/form/FormElement.js b/components/form/FormElement.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import isEqual from 'lodash/isEqual';
-import pick from 'lodash/pick';
+import isEqual from 'react-fast-compare';
 
 import Validator from './Validator';
 
@@ -30,10 +29,8 @@ class FormElement extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
-    const prevPropsParsed = pick(prevProps, ['properties', 'validations']);
-    const currentPropsParsed = pick(this.props, ['properties', 'validations']);
-
-    if (!isEqual(prevPropsParsed, currentPropsParsed)) {
+    if (!isEqual(prevProps.properties, this.props.properties) ||
+        !isEqual(prevProps.validations, this.props.validations)) {
       this.triggerValidate();
     }
 

diff --git a/components/form/Validator.js b/components/form/Validator.js
@@ -1,4 +1,4 @@
-import isEmpty from "lodash/isEmpty";
+import { isEmpty } from "utils/general";
 
 class Validator {
   constructor(intl) {

diff --git a/components/map/index.js b/components/map/index.js
@@ -3,8 +3,8 @@ import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import * as Sentry from "@sentry/nextjs";
 
-import isEqual from 'lodash/isEqual';
-import isEmpty from 'lodash/isEmpty';
+import isEqual from 'react-fast-compare';
+import { isEmpty } from 'utils/general';
 
 import ReactMapGL, { FlyToInterpolator } from 'react-map-gl';
 import { fitBounds } from 'viewport-mercator-project';

diff --git a/components/map/layer-manager/component.js b/components/map/layer-manager/component.js
@@ -4,7 +4,8 @@ import PropTypes from 'prop-types';
 import { LayerManager, Layer } from 'layer-manager/dist/components';
 import { PluginMapboxGl, fetch } from 'layer-manager';
 
-import omit from 'lodash/omit';
+import { omit } from 'utils/general';
+
 import slugify from 'slugify';
 
 class LayerManagerComponent extends PureComponent {
@@ -147,4 +148,4 @@ class LayerManagerComponent extends PureComponent {
   }
 }
 
-export default LayerManagerComponent;
+export default LayerManagerComponent;
diff --git a/components/map/popup/component.js b/components/map/popup/component.js
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'utils/general';
 import isEqual from 'react-fast-compare';
 
 import { Popup } from 'react-map-gl';

diff --git a/components/map/popup/templates/fmu-aac/component.js b/components/map/popup/templates/fmu-aac/component.js
@@ -1,6 +1,5 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import trim from 'lodash/trim';
 
 // Intl
 import { injectIntl } from 'react-intl';
@@ -21,10 +20,10 @@ class FMUAACTemplatePopup extends PureComponent {
       <div className="c-layer-popup">
         {!!fmu && <h3>{fmu.data.data.fmu_name}</h3>}
 
-        {!!aac && (!!trim(aac.data.data.period_val) || aac.data.data.nom_aac) &&
+        {!!aac && (!!String(aac.data.data.period_val || '').trim() || aac.data.data.nom_aac) &&
           <ul className="layer-popup--list">
-            {!!trim(aac.data.data.nom_aac) && <li>Name: {aac.data.data.nom_aac}</li>}
-            {!!trim(aac.data.data.period_val) && <li>Period: {aac.data.data.period_val}</li>}
+            {!!String(aac.data.data.nom_aac || '').trim() && <li>Name: {aac.data.data.nom_aac}</li>}
+            {!!String(aac.data.data.period_val || '').trim() && <li>Period: {aac.data.data.period_val}</li>}
           </ul>
         }
       </div>

diff --git a/components/operators-detail/documentation/documents-by-operator.js b/components/operators-detail/documentation/documents-by-operator.js
@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import sortBy from 'lodash/sortBy';
-import groupBy from 'lodash/groupBy';
-import uniq from 'lodash/uniq';
 import cx from 'classnames';
 import { injectIntl } from 'react-intl';
 import Fuse from 'fuse.js';
 
+import { groupBy } from 'utils/general';
+
 // Redux
 import { connect } from 'react-redux';
 
@@ -52,7 +52,7 @@ function DocumentsByOperator({ groupedByCategory, searchText, user, id, intl, ..
 
     const exactSearchResults = searchText.length > 2 ? documents.filter(exactSearch) : [];
     const fuseSearchResults = fuse.search(searchText).map(r => r.item);
-    return uniq([...exactSearchResults, ...fuseSearchResults]);
+    return [...new Set([...exactSearchResults, ...fuseSearchResults])];
   }
 
   const results = Object.keys(groupedByCategory).map((category) => {

diff --git a/components/operators-detail/documentation/documents-certification.js b/components/operators-detail/documentation/documents-certification.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'utils/general';
 
 // Redux
 import { connect } from 'react-redux';

diff --git a/components/operators-detail/documentation/documents-provided.js b/components/operators-detail/documentation/documents-provided.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import omit from 'lodash/omit';
+import { omit } from 'utils/general';
 import { useRouter } from 'next/router';
 
 // Redux

diff --git a/components/operators-detail/documentation/documents-timeline.js b/components/operators-detail/documentation/documents-timeline.js
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import { Area, AreaChart, ResponsiveContainer, Tooltip, XAxis } from 'recharts';
 import { injectIntl } from 'react-intl';
 import dayjs from 'dayjs';
-import groupBy from 'lodash/groupBy';
 
 // Utils
 import { PALETTE } from 'utils/documentation';
+import { groupBy } from 'utils/general';
 
 function CustomTooltip({ active, payload, label: timestamp, intl }) {
   if (active) {

diff --git a/components/operators-detail/fmus.js b/components/operators-detail/fmus.js
@@ -2,7 +2,7 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 
-import isEqual from 'lodash/isEqual';
+import isEqual from 'react-fast-compare';
 import debounce from 'lodash/debounce';
 
 import getBBox from '@turf/bbox';

diff --git a/components/operators-detail/layout.js b/components/operators-detail/layout.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'utils/general';
 
 // Utils
 import { HELPERS_DOC } from 'utils/documentation';

diff --git a/components/operators/table.js b/components/operators/table.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import sortBy from 'lodash/sortBy';
-import uniq from 'lodash/uniq';
 import { connect } from 'react-redux';
 
 // Next
@@ -43,9 +42,9 @@ class OperatorsTable extends React.Component {
       });
     } else {
       this.setState({
-        expandedOperatorIds: uniq(
+        expandedOperatorIds: [...new Set(
           [id, ...this.state.expandedOperatorIds].sort()
-        ),
+        )],
       });
     }
   };

diff --git a/components/ui/card.js b/components/ui/card.js
@@ -5,7 +5,7 @@ import dynamic from 'next/dynamic';
 import Link from 'next/link';
 
 import classnames from 'classnames';
-import omit from 'lodash/omit';
+import { omit } from 'utils/general';
 
 const Truncate = dynamic(() => import('react-truncate'));
 

diff --git a/components/ui/filters.js b/components/ui/filters.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import isEqual from 'lodash/isEqual';
+import isEqual from 'react-fast-compare';
 
 class Filters extends React.Component {
   componentDidUpdate(prevProps) {

diff --git a/components/ui/notifications.js b/components/ui/notifications.js
@@ -11,7 +11,6 @@ import { injectIntl } from 'react-intl';
 import Spinner from 'components/ui/spinner';
 import modal from 'services/modal';
 import { getNotifications, dismissAll } from 'modules/notifications';
-import { groupBy } from 'lodash';
 
 function isBeforeToday(date) {
   const today = new Date();

diff --git a/components/ui/sawmill-modal.js b/components/ui/sawmill-modal.js
@@ -26,7 +26,6 @@ import LocationSearch from 'components/map/location-search';
 
 import { transformRequest } from 'utils/map';
 import CancelButton from '../form/CancelButton';
-import { set } from 'lodash';
 
 class SawmillModal extends React.Component {
   static propTypes = {

diff --git a/components/ui/user-menu-list.js b/components/ui/user-menu-list.js
@@ -2,7 +2,6 @@ import React from 'react';
 import { useIntl } from 'react-intl';
 import { connect } from 'react-redux';
 import Link from 'next/link';
-import uniq from 'lodash/uniq';
 import uniqBy from 'lodash/uniqBy';
 
 import Notifications from 'components/ui/notifications';

diff --git a/components/users/newsletter.js b/components/users/newsletter.js
@@ -1,14 +1,15 @@
 import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import sortBy from 'lodash/sortBy';
-import groupBy from 'lodash/groupBy';
 
 // Intl
 import { useIntl } from 'react-intl';
 import { connect } from 'react-redux';
 
 import API from 'services/api';
 
+import { groupBy } from 'utils/general';
+
 // Components
 import Form, { FormProvider } from 'components/form/Form';
 import Field from 'components/form/Field';

diff --git a/modules/documents-database.js b/modules/documents-database.js
@@ -1,9 +1,7 @@
-import isEmpty from 'lodash/isEmpty';
-
 import API from 'services/api';
 
 // Utils
-import { encode, decode, parseObjectSelectOptions } from 'utils/general';
+import { encode, decode, parseObjectSelectOptions, isEmpty } from 'utils/general';
 import { setUrlParam } from 'utils/url';
 
 /* Constants */

diff --git a/modules/observations.js b/modules/observations.js
@@ -1,9 +1,7 @@
-import isEmpty from 'lodash/isEmpty';
-
 import API from 'services/api';
 
 // Utils
-import { encode, decode, parseObjectSelectOptions } from 'utils/general';
+import { encode, decode, parseObjectSelectOptions, isEmpty } from 'utils/general';
 import { setUrlParam } from 'utils/url';
 
 /* Constants */

diff --git a/modules/operators-detail-fmus.js b/modules/operators-detail-fmus.js
@@ -1,8 +1,7 @@
-import sumBy from 'lodash/sumBy';
-import uniq from 'lodash/uniq';
 import dayjs from 'dayjs';
 
 import { fetchIntegratedAlertsMetadata } from 'services/layers';
+import { sumBy } from 'utils/general';
 
 const GET_FMU_ANALYSIS_SUCCESS = 'GET_FMU_ANALYSIS_SUCCESS';
 const GET_FMU_ANALYSIS_LOADING = 'GET_FMU_ANALYSIS_LOADING';
@@ -430,11 +429,11 @@ export function getIntegratedAlertsMetadata() {
       // put integrated-alerts before fmusdetail
       dispatch({
         type: SET_OPERATORS_DETAIL_MAP_LAYERS_ACTIVE,
-        payload: uniq([
+        payload: [... new Set([
           ...activeLayers.slice(0, activeLayers.indexOf('fmusdetail')),
           'integrated-alerts',
           ...activeLayers.slice(activeLayers.indexOf('fmusdetail'))
-        ])
+        ])]
       });
     })
   };

diff --git a/modules/operators-ranking.js b/modules/operators-ranking.js
@@ -1,13 +1,10 @@
 import Router from 'next/router';
 
-import groupBy from 'lodash/groupBy';
-import flatten from 'lodash/flatten';
-import uniq from 'lodash/uniq';
-
 import dayjs from 'dayjs';
 
 import API from 'services/api';
 import { fetchIntegratedAlertsMetadata } from 'services/layers';
+import { groupBy } from 'utils/general';
 
 import { CERTIFICATIONS } from 'constants/fmu';
 
@@ -246,12 +243,12 @@ export function getOperatorsRanking() {
         return o['percentage-valid-documents-all'];
       });
       const groupByDocPercentageKeys = Object.keys(groupByDocPercentage).sort().reverse();
-      const rankedData = flatten(groupByDocPercentageKeys.map((k, i) => {
+      const rankedData = groupByDocPercentageKeys.map((k, i) => {
         return groupByDocPercentage[k].map(o => ({
           ...o,
           ranking: i
         }));
-      }));
+      }).flat();
 
       dispatch({
         type: GET_OPERATORS_RANKING_SUCCESS,
@@ -386,11 +383,11 @@ export function getIntegratedAlertsMetadata() {
       // put integrated-alerts before fmus
       dispatch({
         type: SET_OPERATORS_MAP_LAYERS_ACTIVE,
-        payload: uniq([
+        payload: [...new Set([
           ...activeLayers.slice(0, activeLayers.indexOf('fmus')),
           'integrated-alerts',
           ...activeLayers.slice(activeLayers.indexOf('fmus'))
-        ])
+        ])]
       });
     })
   };

diff --git a/modules/user.js b/modules/user.js
@@ -1,5 +1,4 @@
-import omitBy from 'lodash/omitBy';
-import isEmpty from 'lodash/isEmpty';
+import { omitBy, isEmpty } from 'utils/general';
 
 import API, { NEXTAPIClient } from 'services/api'
 

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "react-datepicker": "^4.11.0",
     "react-dom": "18",
     "react-dropzone": "^14.2.3",
-    "react-fast-compare": "^3.2.1",
+    "react-fast-compare": "^3.2.2",
     "react-geosuggest": "^2.7.0",
     "react-intl": "^6.8.4",
     "react-map-gl": "^5.2.1",

diff --git a/pages/database.js b/pages/database.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import isEmpty from 'lodash/isEmpty';
-import isEqual from 'lodash/isEqual';
+import { isEmpty } from 'utils/general';
+import isEqual from 'react-fast-compare';
 
 // Redux
 import { connect } from 'react-redux';

diff --git a/pages/observations.js b/pages/observations.js
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
-import isEqual from 'lodash/isEqual';
+import isEqual from 'react-fast-compare';
 import orderBy from 'lodash/orderBy';
 import debounce from 'lodash/debounce';
 import { connect } from 'react-redux';

diff --git a/pages/operator/edit/[[...id]].js b/pages/operator/edit/[[...id]].js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'utils/general';
 
 // Next
 import Link from 'next/link';