Merge pull request #491 from commons-stack/lodash_imports

Lodash Imports
givepraise · Jun 21, 2022 · c4c25f7 · c4c25f7
2 parents 516668b + 3847625
commit c4c25f7
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Prevent unncessary import of mongoose package by frontend #466
 - Switching eth wallet should result in logging out the user #469
 - Logging out of MetaMask causes EthAccount in navigation to disappear #470
+- Changed lodash imports to single method import #486
 
 ## [0.8.0] - 2022-06-06
 

diff --git a/packages/api/src/period/controllers/assignment.ts b/packages/api/src/period/controllers/assignment.ts
@@ -14,7 +14,11 @@ import { EventLogTypeKey } from '@eventlog/types';
 import { logEvent } from '@eventlog/utils';
 import { firstFit, PackingOutput } from 'bin-packer';
 import logger from 'jet-logger';
-import { flatten, intersection, range, sum, zip } from 'lodash';
+import flatten from 'lodash/flatten';
+import intersection from 'lodash/intersection';
+import range from 'lodash/range';
+import sum from 'lodash/sum';
+import zip from 'lodash/zip';
 import { StatusCodes } from 'http-status-codes';
 import { Request } from 'express';
 import greedyPartitioning from 'greedy-number-partitioning';

diff --git a/packages/api/src/period/utils.ts b/packages/api/src/period/utils.ts
@@ -4,7 +4,7 @@ import { calculateReceiverCompositeScore } from '@praise/utils/score';
 import { periodsettingListTransformer } from '@periodsettings/transformers';
 import { PeriodSettingsModel } from '@periodsettings/entities';
 import { settingValue } from '@shared/settings';
-import { some } from 'lodash';
+import some from 'lodash/some';
 import { PeriodModel } from './entities';
 import {
   periodDetailsReceiverListTransformer,

diff --git a/packages/api/src/praise/utils/score.ts b/packages/api/src/praise/utils/score.ts
@@ -2,7 +2,7 @@ import { BadRequestError } from '@error/errors';
 import { settingValue } from '@shared/settings';
 import { PeriodDetailsReceiver } from '@period/types';
 import { Types } from 'mongoose';
-import { sum } from 'lodash';
+import sum from 'lodash/sum';
 import { PraiseModel } from '../entities';
 import { Quantification } from '../types';
 import { getPraisePeriod, isQuantificationCompleted } from './core';

diff --git a/packages/api/src/tests/score.spec.ts b/packages/api/src/tests/score.spec.ts
@@ -15,7 +15,7 @@ import { PeriodModel } from '@period/entities';
 import { PeriodDetailsReceiver } from '@period/types';
 import { PraiseModel } from '@praise/entities';
 import { settingValue } from '@shared/settings';
-import { sum } from 'lodash';
+import sum from 'lodash/sum';
 import { getPeriodDateRangeQuery } from '@period/utils';
 import faker from 'faker';
 import { add } from 'date-fns';

diff --git a/packages/frontend/src/components/eventlog/EventLog.tsx b/packages/frontend/src/components/eventlog/EventLog.tsx
@@ -31,8 +31,6 @@ interface Params {
 const EventLog = ({ eventlog, className = '' }: Params): JSX.Element | null => {
   const user = useRecoilValue(SingleUser(eventlog.user));
 
-  console.log(eventlog);
-
   return (
     <div className={classNames('flex items-center w-full', className)}>
       <div className="flex items-center text-2xl">

diff --git a/packages/frontend/src/components/form/DayInput.tsx b/packages/frontend/src/components/form/DayInput.tsx
@@ -32,7 +32,6 @@ const DayInput = ({
   const [pickerVisible, setPickerVisible] = useState<boolean>(false);
 
   const handleDayClick = (day: Date): void => {
-    console.log('day clicked is', day);
     onChange(formatIsoDateUTC(day.toISOString(), DATE_FORMAT));
     setPickerVisible(false);
   };

diff --git a/packages/frontend/src/components/form/MultiselectInput.tsx b/packages/frontend/src/components/form/MultiselectInput.tsx
@@ -22,7 +22,7 @@ const MultiselectInput = ({
   noSelectedMessage,
 }: MultiselectInputProps): JSX.Element => {
   return (
-    <div className="relative w-60 border border-warm-gray-400 h-[42px]">
+    <div className="relative border border-warm-gray-400 h-[42px]">
       <Listbox value={selected} onChange={handleChange} multiple>
         <Listbox.Button className=" pl-2 pr-8 text-left h-[42px] w-full bg-transparent border-none outline-none focus:ring-0 ">
           {(): JSX.Element => (

diff --git a/packages/frontend/src/components/form/SelectInput.tsx b/packages/frontend/src/components/form/SelectInput.tsx
@@ -23,7 +23,7 @@ const SelectInput = ({
   icon,
 }: SelectInputProps): JSX.Element => {
   return (
-    <div className="relative w-40 h-[42px]">
+    <div className="relative h-[42px]">
       <Listbox value={selected} onChange={handleChange}>
         <Listbox.Button className="h-[42px] border border-warm-gray-400 w-full py-1.5 pl-3 pr-10 text-left bg-transparent  ">
           <span className="block truncate">{selected.label}</span>

diff --git a/packages/frontend/src/components/settings/SettingsForm.tsx b/packages/frontend/src/components/settings/SettingsForm.tsx
@@ -11,7 +11,7 @@ import {
 } from '@/model/settings';
 import { Form } from 'react-final-form';
 import { useRecoilValue } from 'recoil';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import SubmitButton from '../form/SubmitButton';
 import { PeriodSettingDto } from 'api/src/periodsettings/types';
 import { SettingDto } from 'api/dist/settings/types';

diff --git a/packages/frontend/src/index.tsx b/packages/frontend/src/index.tsx
@@ -16,7 +16,7 @@ import {
   Theme as RainbowTheme,
   darkTheme,
 } from '@rainbow-me/rainbowkit';
-import { merge } from 'lodash';
+import merge from 'lodash/merge';
 import { configureChains, createClient, WagmiConfig, chain } from 'wagmi';
 import { publicProvider } from 'wagmi/providers/public';
 import Routes from './navigation/Routes';

diff --git a/packages/frontend/src/model/periodsettings.ts b/packages/frontend/src/model/periodsettings.ts
@@ -8,7 +8,7 @@ import {
   useRecoilCallback,
   useRecoilValue,
 } from 'recoil';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import { ApiAuthGet, useAuthApiQuery, isResponseOk } from './api';
 import { Setting, useSetSettingReturn } from './settings';
 import { PeriodSettingDto } from 'api/src/periodsettings/types';

diff --git a/packages/frontend/src/navigation/AuthenticatedRoutes.tsx b/packages/frontend/src/navigation/AuthenticatedRoutes.tsx
@@ -3,7 +3,7 @@ import StartPage from '@/pages/Start/StartPage';
 import { ROLE_ADMIN, ROLE_QUANTIFIER } from '@/model/auth';
 import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
-import { difference } from 'lodash';
+import difference from 'lodash/difference';
 
 const MyPraisePage = React.lazy(() => import('@/pages/MyPraise/MyPraisePage'));
 const UserDetailsPage = React.lazy(

diff --git a/packages/frontend/src/pages/Activate/ActivatePage.tsx b/packages/frontend/src/pages/Activate/ActivatePage.tsx
@@ -7,7 +7,8 @@ import { useState, useEffect } from 'react';
 import { toast } from 'react-hot-toast';
 import { useHistory, useLocation } from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
-import { upperFirst, lowerCase } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
+import lowerCase from 'lodash/lowerCase';
 import { useAccount } from 'wagmi';
 import { requestApiActivate } from '@/utils/auth';
 import SignMessageLayout from '../../layouts/SignMessageLayout';

diff --git a/packages/frontend/src/pages/EventLogs/EventLogsPage.tsx b/packages/frontend/src/pages/EventLogs/EventLogsPage.tsx
@@ -96,7 +96,7 @@ const EventLogsPage = (): JSX.Element => {
       <div className="p-0 praise-box">
         <div className="flex mb-8">
           {/* Filter */}
-          <div className="mt-5 mb-5 ml-5 mr-4">
+          <div className="w-3/12 mt-5 mb-5 ml-5 mr-4">
             <MultiselectInput
               handleChange={(e): void => {
                 setSelectedFilters(e);
@@ -109,7 +109,7 @@ const EventLogsPage = (): JSX.Element => {
           </div>
 
           {/* Search */}
-          <div className="mt-5 mb-5 mr-4">
+          <div className="w-5/12 mt-5 mb-5 mr-4">
             <SearchInput
               handleChange={(e): void => {
                 setSearchValue(e);
@@ -120,7 +120,7 @@ const EventLogsPage = (): JSX.Element => {
           </div>
 
           {/* Sort */}
-          <div className="mt-5 mb-5 ml-auto mr-5">
+          <div className="w-2/12 mt-5 mb-5 ml-auto mr-5">
             <SelectInput
               handleChange={(e): void => {
                 setSelectedSort(e);

diff --git a/packages/frontend/src/pages/EventLogs/components/EventLogsList.tsx b/packages/frontend/src/pages/EventLogs/components/EventLogsList.tsx
@@ -34,8 +34,8 @@ const EventLogsTable = ({
         ))}
       </div>
       {(data.hasNextPage || data.hasPrevPage) && (
-        <div className="flex justify-between w-full mt-4 space-x-4">
-          <div>
+        <div className="flex justify-between w-full mt-5">
+          <div className="mb-5 ml-5 text-left">
             {data.hasPrevPage && (
               <a
                 className="cursor-pointer"
@@ -44,14 +44,14 @@ const EventLogsTable = ({
                 <FontAwesomeIcon
                   icon={faArrowLeft}
                   size="1x"
-                  className="pl-5 mr-2"
+                  className="mr-2"
                 />
                 Previous
               </a>
             )}
           </div>
 
-          <div>
+          <div className="mb-5 mr-5 text-right">
             {data.hasNextPage && (
               <a
                 className="cursor-pointer"
@@ -62,7 +62,7 @@ const EventLogsTable = ({
                 <FontAwesomeIcon
                   icon={faArrowRight}
                   size="1x"
-                  className="pr-5 ml-2"
+                  className="ml-2"
                 />
               </a>
             )}

diff --git a/packages/frontend/src/pages/Periods/Details/components/QuantifierTable.tsx b/packages/frontend/src/pages/Periods/Details/components/QuantifierTable.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 import { useParams } from 'react-router-dom';
 import { TableOptions, useTable } from 'react-table';
 import { useRecoilValue } from 'recoil';
-import { sortBy } from 'lodash';
+import sortBy from 'lodash/sortBy';
 import { classNames } from '@/utils/index';
 import { UserAvatarAndName } from '@/components/user/UserAvatarAndName';
 

diff --git a/packages/frontend/src/pages/Periods/Details/components/ReceiverTable.tsx b/packages/frontend/src/pages/Periods/Details/components/ReceiverTable.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 import { useHistory, useParams } from 'react-router-dom';
 import { TableOptions, useSortBy, useTable } from 'react-table';
 import { useRecoilValue } from 'recoil';
-import { sortBy } from 'lodash';
+import sortBy from 'lodash/sortBy';
 import { classNames } from '@/utils/index';
 import { UserAvatarAndName } from '@/components/user/UserAvatarAndName';
 

diff --git a/packages/frontend/src/pages/QuantifyPeriodReceiver/components/QuantifyTable.tsx b/packages/frontend/src/pages/QuantifyPeriodReceiver/components/QuantifyTable.tsx
@@ -4,7 +4,8 @@ import { useQuantifyPraise } from '@/model/praise';
 import { usePeriodSettingValueRealized } from '@/model/periodsettings';
 import getWeek from 'date-fns/getWeek';
 import parseISO from 'date-fns/parseISO';
-import { groupBy, sortBy } from 'lodash';
+import groupBy from 'lodash/groupBy';
+import sortBy from 'lodash/sortBy';
 import React from 'react';
 import { useRecoilValue } from 'recoil';
 import { QuantifyBackNextLink } from './BackNextLink';