NERT-314 auth project new view UI part 1, other minor changes

app/.pipeline/config.js

@@ -76,7 +76,7 @@ const phases = {
     suffix: `-dev-${deployChangeId}`,
     instance: `${name}-dev-${deployChangeId}`,
     version: `${deployChangeId}-${changeId}`,
-    tag: `dev-${version}-${deployChangeId}`,
+    tag: `dev-${version}`,
     host: (isStaticDeployment && staticUrls.dev) || `${name}-${changeId}-d83219-dev.apps.silver.devops.gov.bc.ca`,
     apiHost:
       (isStaticDeployment && staticUrlsAPI.dev) || `${apiName}-${changeId}-d83219-dev.apps.silver.devops.gov.bc.ca`,

app/src/components/layout/Header.tsx

@@ -114,13 +114,9 @@ const pageStyles = {
 
 const Header: React.FC = () => {
   const config = useContext(ConfigContext);
-  console.log(config);
+
   const mmm = config?.VERSION ? config.VERSION.split('-')[1] : '0.0.0';
-  const nert_version = config?.CHANGE_VERSION
-    ? mmm
-      ? `${mmm}.${config.CHANGE_VERSION}`
-      : `0.0.0.${config.CHANGE_VERSION}`
-    : '0.0.0.NA';
+  const nert_version = mmm ?? '0.0.0.NA';
   const nert_environment = config?.REACT_APP_NODE_ENV || 'undefined';
 
   const { keycloakWrapper } = useContext(AuthStateContext);

app/src/components/map/MapContainer.test.tsx

@@ -1,9 +1,9 @@
 import { cleanup, render } from '@testing-library/react';
 import bbox from '@turf/bbox';
 import React from 'react';
-import MapContainer from './MapContainer';
 import { IMarker } from './components/MarkerCluster';
 import { IStaticLayer } from './components/StaticLayers';
+import MapContainer from './MapContainer';
 
 describe('MapContainer', () => {
   afterEach(() => {

app/src/components/map/MapContainer.tsx

@@ -1,8 +1,8 @@
 import { Feature } from 'geojson';
 import L, { LeafletEventHandlerFnMap } from 'leaflet';
 import 'leaflet-draw/dist/leaflet.draw.css';
-import 'leaflet-fullscreen/dist/Leaflet.fullscreen.js';
 import 'leaflet-fullscreen/dist/leaflet.fullscreen.css';
+import 'leaflet-fullscreen/dist/Leaflet.fullscreen.js';
 import iconRetina from 'leaflet/dist/images/marker-icon-2x.png';
 import icon from 'leaflet/dist/images/marker-icon.png';
 import iconShadow from 'leaflet/dist/images/marker-shadow.png';

app/src/components/map/MapContainer2.tsx

@@ -594,7 +594,7 @@
 
     /* Add popup for the points */
     map.on('click', 'markerProjects.points', (e: any) => {
       const prop = e.features![0].properties;
 
       const html = makePopup(prop.name, prop.id, true);
 
@@ -610,7 +610,7 @@
 
     /* Add popup for the points */
     map.on('click', 'markerPlans.points', (e: any) => {
       const prop = e.features![0].properties;
 
       // TBD: Currently the /plans route is not available
       // const html = makePopup(prop.name, prop.id, false);
@@ -849,8 +849,8 @@
     return plansVisible && !feature.properties.is_project
       ? feature
       : projectsVisible && feature.properties.is_project
-        ? feature
-        : null;
+      ? feature
+      : null;
   });
   if (map.getSource('markers')) {
     // @ts-ignore

app/src/components/security/Guards.tsx

@@ -1,6 +1,6 @@
 import { PROJECT_ROLE, SYSTEM_ROLE } from 'constants/roles';
 import { AuthStateContext } from 'contexts/authStateContext';
-import React, { PropsWithChildren, ReactElement, isValidElement, useContext } from 'react';
+import React, { isValidElement, PropsWithChildren, ReactElement, useContext } from 'react';
 import { useParams } from 'react-router-dom';
 import { isAuthenticated } from 'utils/authUtils';
 

app/src/contexts/dialogContext.tsx

@@ -4,7 +4,7 @@ import IconButton from '@mui/material/IconButton';
 import Snackbar from '@mui/material/Snackbar';
 import { ErrorDialog, IErrorDialogProps } from 'components/dialog/ErrorDialog';
 import YesNoDialog, { IYesNoDialogProps } from 'components/dialog/YesNoDialog';
-import React, { ReactNode, createContext, useState } from 'react';
+import React, { createContext, ReactNode, useState } from 'react';
 
 export interface IDialogContext {
   /**

app/src/features/projects/Plans.tsx

@@ -10,7 +10,7 @@ import PlanFilter, {
   IPlanAdvancedFilters,
   PlanAdvancedFiltersInitialValues
 } from 'components/search-plan-filter/PlanFilter';
-import { ICONS, focusOptions, planStatusOptions } from 'constants/misc';
+import { focusOptions, ICONS, planStatusOptions } from 'constants/misc';
 import { DialogContext } from 'contexts/dialogContext';
 import { Formik, FormikProps } from 'formik';
 import { APIError } from 'hooks/api/useAxios';

app/src/features/projects/Projects.tsx

@@ -10,7 +10,7 @@ import ProjectFilter, {
   IProjectAdvancedFilters,
   ProjectAdvancedFiltersInitialValues
 } from 'components/search-project-filter/ProjectFilter';
-import { ICONS, focusOptions, projectStatusOptions } from 'constants/misc';
+import { focusOptions, ICONS, projectStatusOptions } from 'constants/misc';
 import { DialogContext } from 'contexts/dialogContext';
 import { Formik, FormikProps } from 'formik';
 import { APIError } from 'hooks/api/useAxios';

app/src/features/projects/ProjectsRouter.tsx

@@ -1,14 +1,14 @@
 import { RoleGuard, SystemRoleGuard } from 'components/security/Guards';
 import { PROJECT_ROLE, SYSTEM_ROLE } from 'constants/roles';
 import EditProjectPage from 'features/edit/EditProjectPage';
-import ProjectsLayout from 'features/projects/ProjectsLayout';
 import CreateProjectPage from 'features/projects/create/CreateProjectPage';
+import ProjectsLayout from 'features/projects/ProjectsLayout';
 import ViewProjectPage from 'features/projects/view/ViewProjectPage';
 import React from 'react';
 import { Navigate, Route, Routes } from 'react-router-dom';
 import { RedirectURL } from 'utils/AppRoutesUtils';
-import ProjectsPlansListPage from './ProjectsPlansListPage';
 import ProjectParticipantsPage from './participants/ProjectParticipantsPage';
+import ProjectsPlansListPage from './ProjectsPlansListPage';
 
 /**
  * Router for all `/admin/project/*` pages.

app/src/features/projects/create/CreateProjectPage.test.tsx

@@ -1,7 +1,7 @@
 import {
   cleanup,
-  fireEvent,
   findByText as rawFindByText,
+  fireEvent,
   getByText as rawGetByText,
   render,
   waitFor

app/src/features/projects/participants/ProjectParticipantsPage.tsx

@@ -94,8 +94,9 @@
   };
 
   const getProject = useCallback(async () => {
-    const projectWithDetailsResponse =
-      await restorationTrackerApi.project.getProjectById(projectId);
+    const projectWithDetailsResponse = await restorationTrackerApi.project.getProjectById(
+      projectId
+    );
 
     if (!projectWithDetailsResponse) {
       return;