feature/dep315: Sonar cube optimizations and removal of console.log() instances.

Author: jareth-whitney

web/src/components/landing/EngagementTile.tsx

@@ -48,7 +48,6 @@ const EngagementTile = ({ passedEngagement, engagementId }: EngagementTileProps)
         }
 
         try {
-            console.log('getting engagement with id', engagementId);
             const engagement = await getEngagement(engagementId);
             setLoadedEngagement(engagement);
         } catch {

web/src/components/landing/FilterDrawer.tsx

@@ -130,31 +130,30 @@ const FilterDrawer = () => {
                         ))}
                     </Stack>
 
-                    {filters &&
-                        filters.map((metadataFilter) => (
-                            <React.Fragment key={metadataFilter.taxon_id}>
-                                <Heading4 mt={3}>
-                                    {translate('landing.filters.drawer.filterHeader').replace(
-                                        '{0}',
-                                        metadataFilter.name ?? 'metadata',
-                                    )}
-                                </Heading4>
-                                <Stack direction="row" sx={{ mb: 2, mt: 2.5 }} flexWrap="wrap">
-                                    {metadataFilter.values.map((value) => (
-                                        <MetadataFilterChip
-                                            key={`${metadataFilter.taxon_id}-${value}`}
-                                            name={value}
-                                            selected={getSearchParamObject('meta_filters', searchParams)?.some(
-                                                (filter: MetadataFilter) =>
-                                                    filter.taxon_id === metadataFilter.taxon_id &&
-                                                    filter.values.includes(value),
-                                            )}
-                                            onClick={() => handleMetadataFilterClick(metadataFilter.taxon_id, value)}
-                                        />
-                                    ))}
-                                </Stack>
-                            </React.Fragment>
-                        ))}
+                    {filters?.map((metadataFilter) => (
+                        <React.Fragment key={metadataFilter.taxon_id}>
+                            <Heading4 mt={3}>
+                                {translate('landing.filters.drawer.filterHeader').replace(
+                                    '{0}',
+                                    metadataFilter.name ?? 'metadata',
+                                )}
+                            </Heading4>
+                            <Stack direction="row" sx={{ mb: 2, mt: 2.5 }} flexWrap="wrap">
+                                {metadataFilter.values.map((value) => (
+                                    <MetadataFilterChip
+                                        key={`${metadataFilter.taxon_id}-${value}`}
+                                        name={value}
+                                        selected={getSearchParamObject('meta_filters', searchParams)?.some(
+                                            (filter: MetadataFilter) =>
+                                                filter.taxon_id === metadataFilter.taxon_id &&
+                                                filter.values.includes(value),
+                                        )}
+                                        onClick={() => handleMetadataFilterClick(metadataFilter.taxon_id, value)}
+                                    />
+                                ))}
+                            </Stack>
+                        </React.Fragment>
+                    ))}
 
                     <Grid size={12} container justifyContent="flex-start" alignItems="flex-end">
                         <Button

web/src/components/landing/TileBlock.tsx

@@ -30,7 +30,6 @@ const TileBlock = () => {
             try {
                 const es = await engs;
                 if (es) {
-                    console.log(es);
                     setEngagements(es.items);
                     setCount(es.total);
                     setAriaStatusMessage(`${es?.total} results`);

web/src/components/landing/index.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useEffect, useState } from 'react';
+import React, { createContext, useEffect, useMemo, useState } from 'react';
 import { LandingData } from './types';
 import { defaultLandingData, defaultSearchFilters } from './constants';
 import { useLoaderData, useRevalidator, useSearchParams } from 'react-router';
@@ -32,28 +32,40 @@ export const Landing = () => {
         setSearchParams(newSearchParams);
     };
 
-    const landingData = {
-        tenant,
-        engagements,
-        allMetaFilters,
-        searchParams,
-        setSearchParams,
-        filtersOpen,
-        setFiltersOpen,
-        loadingEngagements,
-        setLoadingEngagements,
-        clearFilters,
-    };
+    const landingData = useMemo(
+        () => ({
+            tenant,
+            engagements,
+            allMetaFilters,
+            searchParams,
+            setSearchParams,
+            filtersOpen,
+            setFiltersOpen,
+            loadingEngagements,
+            setLoadingEngagements,
+            clearFilters,
+        }),
+        [
+            tenant,
+            engagements,
+            allMetaFilters,
+            searchParams,
+            setSearchParams,
+            filtersOpen,
+            loadingEngagements,
+            clearFilters,
+        ],
+    );
 
     return (
-        <LandingDataContext value={landingData}>
+        <LandingDataContext.Provider value={landingData}>
             <ThemeProvider theme={DarkTheme}>
                 <FilterDrawer />
             </ThemeProvider>
             <LandingHero />
             <LandingIntro />
             <EngagementSearch />
-        </LandingDataContext>
+        </LandingDataContext.Provider>
     );
 };
 

web/src/components/landing/landingLoader.tsx

@@ -32,26 +32,12 @@ const landingLoader = ({ request }: LoaderFunctionArgs): LandingLoaderData => {
         include_banner_url: defaultSearchFilters.include_banner_url,
     });
 
-    console.log({
-        search_text: searchText ?? defaultSearchFilters.search_text,
-        page: Number(page ?? defaultSearchFilters.page),
-        metadata: metaFilters && tryParse(metaFilters) ? JSON.parse(metaFilters) : defaultSearchFilters.meta_filters,
-        engagement_status: translateEngagementStatus(engagementStatus),
-        sort_key: sortKey ?? defaultSearchFilters.sort_key,
-        sort_order: (sortOrder && validSortOrders.includes(sortOrder)
-            ? sortOrder
-            : defaultSearchFilters.sort_order) as SortOrder,
-        size: defaultSearchFilters.size,
-        include_banner_url: defaultSearchFilters.include_banner_url,
-    });
-
     return { engagements: engagementsPromise, allMetaFilters: metaFiltersPromise };
 };
 
 const translateEngagementStatus = (es: string): EngagementStatus[] => {
     if (es && tryParse(es)) {
         const parsed = JSON.parse(es);
-        console.log(parsed);
         if (Object.keys(defaultLandingStatuses) === Object.keys(parsed) || parsed?.includes(-1)) {
             return [];
         }

web/src/components/landing/types.ts

@@ -7,7 +7,7 @@ import { ReactNode } from 'react';
 import { TenantState } from 'reduxSlices/tenantSlice';
 import { Page } from 'services/type';
 
-export type SortOrder = 'desc' | 'asc' | undefined;
+export type SortOrder = 'desc' | 'asc';
 
 export interface SearchFilters {
     page?: number;