Improved layout of project searched items, started implementing searc…

…h header, implemented edit route (not editing yet), implemented gql mutation for deleting projects (no deleting yet)

src/api/src/graphql/resolvers/mutations/delete-project/index.js

@@ -0,0 +1,9 @@
+/**
+ * Set project and all child entities to have deletedAt = new Date()... etc.
+ * return the project
+ */
+
+// eslint-disable-next-line
+export default async (_, args, ctx) => {
+  throw new Error('TODO')
+}

src/api/src/graphql/resolvers/queries/projects/build-query.js

@@ -84,7 +84,7 @@ export default ({ fields, table, ids, vocabularyFilters }) => {
         })
         .join('\n')}
         
-    where
+    where [${table}].deletedAt is null and
       ${ids.length ? `[${table}].id in (${ids.join(',')})` : '1 = 1'}
       ${vocabularyFilters.length ? 'and ' : ''}
       ${vocabularyFilters

src/api/src/graphql/resolvers/types/mutation.js

@@ -1,5 +1,6 @@
 import createProject from '../mutations/create-project/index.js'
-import updateProject from '../mutations/update-project.js'
+import updateProject from '../mutations/update-project/index.js'
+import deleteProject from '../mutations/delete-project/index.js'
 import updateVocabulary from '../mutations/update-vocabulary/index.js'
 import integrateOldDb from '../mutations/integrate-old-db/index.js'
 
@@ -8,4 +9,5 @@ export default {
   updateProject,
   updateVocabulary,
   integrateOldDb,
+  deleteProject,
 }

src/api/src/graphql/schema/type-defs/main.graphql

@@ -88,4 +88,5 @@ type Mutation {
     mitigationForms: [MitigationInput!]
     adaptationForms: [AdaptationInput!]
   ): Project!
+  deleteProject(id: ID!): Project
 }

src/api/src/mssql/setup-db/sql/schema.sql

@@ -186,6 +186,7 @@ create table Projects (
 	alternativeContact nvarchar(255),
 	alternativeContactEmail nvarchar(255),
 	leadAgent nvarchar(255),
+	deletedAt date,
 	interventionType int foreign key references VocabularyXrefTree (id),
 	projectStatus int foreign key references VocabularyXrefTree (id),
 	validationStatus int foreign key references VocabularyXrefTree (id),	
@@ -195,7 +196,7 @@ create table Projects (
 	hostSubSector int foreign key references VocabularyXrefTree (id),
 	province int foreign key references VocabularyXrefTree (id),
 	districtMunicipality int foreign key references VocabularyXrefTree (id),
-	localMunicipality int foreign key references VocabularyXrefTree (id)	
+	localMunicipality int foreign key references VocabularyXrefTree (id)
 );
 end
 
@@ -228,6 +229,7 @@ create table Mitigations (
   researchTargetAudience nvarchar(255),
   researchAuthor nvarchar(255),
   researchPaper nvarchar(255),
+	deletedAt date,
 	energyOrEmissionsData int foreign key references VocabularyXrefTree (id),
 	mitigationType int foreign key references VocabularyXrefTree (id),
 	mitigationSubType int foreign key references VocabularyXrefTree (id),
@@ -256,7 +258,8 @@ create table EnergyData (
 	year int not null,
 	annualKwh int not null default 0,
 	annualKwhPurchaseReduction int not null default 0,
-	notes nvarchar(4000) null
+	notes nvarchar(4000) null,
+	deletedAt date
 );
 end
 
@@ -274,7 +277,8 @@ create table EmissionsData (
 	mitigationId int not null foreign key references Mitigations (id),
 	emissionType int not null foreign key references VocabularyXrefTree (id),
 	year int not null,
-	notes nvarchar(4000) null
+	notes nvarchar(4000) null,
+	deletedAt date
 );
 end
 
@@ -291,7 +295,8 @@ create table EmissionsDataXrefVocabTreeX (
   id int not null identity primary key,
 	emissionsDataId int not null foreign key references EmissionsData (id),
 	chemical int not null foreign key references VocabularyXrefTree (id),
-	tonnesPerYear int not null
+	tonnesPerYear int not null,
+	deletedAt date
 );
 end
 
@@ -318,6 +323,7 @@ create table Adaptations (
   researchTargetAudience nvarchar(255),
   researchAuthor nvarchar(255),
   researchPaper nvarchar(255),
+	deletedAt date,
 	interventionStatus int foreign key references VocabularyXrefTree (id),
   adaptationSector int foreign key references VocabularyXrefTree (id),
   adaptationPurpose int foreign key references VocabularyXrefTree (id),

src/client/src/layout/header/appbar/breadcrumbs.jsx

@@ -4,6 +4,7 @@ import Breadcrumbs from '@material-ui/core/Breadcrumbs'
 import { Link, useLocation } from 'react-router-dom'
 import MuiLink from '@material-ui/core/Link'
 import navItems from './nav-items'
+import EditIcon from 'mdi-react/EditIcon'
 
 const useStyles = makeStyles(theme => ({
   link: {
@@ -41,6 +42,9 @@ export default function IconBreadcrumbs() {
         })}
 
       {tree.slice(-1).map(({ label, Icon } = {}) => {
+        if (label === 'Edit') {
+          Icon = EditIcon
+        }
         return (
           <Typography key={label} color="textPrimary" className={classes.link}>
             {Icon && <Icon className={classes.icon} />}

src/client/src/layout/routes/index.jsx

@@ -6,6 +6,7 @@ const HomePage = lazy(() => import('../../pages/home'))
 const AccessPage = lazy(() => import('../../pages/access'))
 const ProjectsPage = lazy(() => import('../../pages/projects'))
 const ProjectPage = lazy(() => import('../../pages/project'))
+const EditProjectPage = lazy(() => import('../../pages/edit-project'))
 const SubmitProjectPage = lazy(() => import('../../pages/submit-project'))
 const DeploymentsPage = lazy(() => import('../../pages/deployments'))
 
@@ -60,6 +61,18 @@ export default withRouter(() => {
         )}
       />
 
+      {/* EDIT PROJECT */}
+      <Route
+        key={'edit-project'}
+        path={'/projects/:id/edit'}
+        exact
+        render={props => (
+          <Transition tKey="edit-project">
+            <EditProjectPage id={props.match.params.id} {...props} />
+          </Transition>
+        )}
+      />
+
       {/* PROJECT */}
       <Route
         key={'project'}

src/client/src/pages/edit-project/index.jsx

@@ -0,0 +1,114 @@
+import { useQuery, gql } from '@apollo/client'
+import Loading from '../../components/loading'
+import Card from '@material-ui/core/Card'
+import CardContent from '@material-ui/core/CardContent'
+import useTheme from '@material-ui/core/styles/useTheme'
+
+export default ({ id }) => {
+  const theme = useTheme()
+  const { error, loading, data } = useQuery(
+    gql`
+      query projects($ids: [Int!]) {
+        projects(ids: $ids) {
+          id
+          title
+          description
+          projectManager
+          link
+          startDate
+          endDate
+          validationComments
+          fundingOrganisation
+          fundingPartner
+          budgetLower
+          budgetUpper
+          hostOrganisation
+          hostPartner
+          alternativeContact
+          alternativeContactEmail
+          leadAgent
+          interventionType
+          projectStatus
+          validationStatus
+          fundingStatus
+          estimatedBudget
+          hostSector
+          hostSubSector
+          province
+          districtMunicipality
+          localMunicipality
+          mitigations {
+            id
+            title
+            description
+            carbonCredit
+            volMethodology
+            goldStandard
+            vcs
+            yx
+            otherCarbonCreditStandard
+            otherCarbonCreditStandardDescription
+            cdmProjectNumber
+            cdmStatus
+            isResearch
+            researchDescription
+            energyOrEmissionsData
+            energyData
+            emissionsData
+            researchType
+            researchTargetAudience
+            researchAuthor
+            researchPaper
+            mitigationType
+            mitigationSubType
+            interventionStatus
+            cdmMethodology
+            cdmExecutiveStatus
+            hostSector
+            hostSubSectorPrimary
+            hostSubSectorSecondary
+          }
+          adaptations {
+            id
+            title
+            description
+            startDate
+            endDate
+            yx
+            isResearch
+            interventionStatus
+            researchDescription
+            researchType
+            researchTargetAudience
+            researchAuthor
+            researchPaper
+            adaptationSector
+            adaptationPurpose
+            hazardFamily
+            hazardSubFamily
+            hazard
+            subHazard
+          }
+        }
+      }
+    `,
+    { variables: { ids: [parseInt(id, 10)] } }
+  )
+
+  if (loading) {
+    return <Loading />
+  }
+
+  if (error) {
+    throw error
+  }
+
+  return (
+    <Card style={{ backgroundColor: theme.backgroundColor }} variant="outlined">
+      <CardContent>
+        <h1>Edit page</h1>
+        <pre>{JSON.stringify(data, null, 2)}</pre>
+      </CardContent>
+    </Card>
+  )
+}

src/client/src/pages/projects/context.jsx

@@ -56,20 +56,6 @@ export default ({ children }) => {
           id
           title
           description
-          projectManager
-          link
-          startDate
-          endDate
-          validationComments
-          fundingOrganisation
-          fundingPartner
-          budgetLower
-          budgetUpper
-          hostOrganisation
-          hostPartner
-          alternativeContact
-          alternativeContactEmail
-          leadAgent
           interventionType
           projectStatus
           validationStatus
@@ -82,26 +68,6 @@ export default ({ children }) => {
           localMunicipality
           mitigations {
             id
-            title
-            description
-            carbonCredit
-            volMethodology
-            goldStandard
-            vcs
-            yx
-            otherCarbonCreditStandard
-            otherCarbonCreditStandardDescription
-            cdmProjectNumber
-            cdmStatus
-            isResearch
-            researchDescription
-            energyOrEmissionsData
-            energyData
-            emissionsData
-            researchType
-            researchTargetAudience
-            researchAuthor
-            researchPaper
             mitigationType
             mitigationSubType
             interventionStatus
@@ -113,20 +79,9 @@ export default ({ children }) => {
           }
           adaptations {
             id
-            title
-            description
-            startDate
-            endDate
-            yx
-            isResearch
-            interventionStatus
-            researchDescription
-            researchType
-            researchTargetAudience
-            researchAuthor
-            researchPaper
             adaptationSector
             adaptationPurpose
+            interventionStatus
             hazardFamily
             hazardSubFamily
             hazard

src/client/src/pages/projects/header/_download-data.jsx

@@ -0,0 +1,16 @@
+import DownloadIcon from 'mdi-react/DownloadIcon'
+import Button from '@material-ui/core/Button'
+
+export default () => {
+  return (
+    <Button
+      disableElevation
+      size="small"
+      variant="contained"
+      color="primary"
+      startIcon={<DownloadIcon size={18} />}
+    >
+      Download data
+    </Button>
+  )
+}

src/client/src/pages/projects/header/mobile-side-menu.jsx → src/client/src/pages/projects/header/_mobile-side-menu.jsx

@@ -12,17 +12,21 @@ export default ({ Filters, filters }) => {
     <>
       <Drawer
         id="mobile-filters-menu"
-        PaperProps={{ style: { maxWidth: '100%' } }}
-        anchor="right"
+        PaperProps={{ style: { width: '100%' } }}
+        anchor="left"
         open={showSidebar}
         onOpen={() => setShowSidebar(true)}
         onClose={() => setShowSidebar(false)}
       >
-        <Grid item xs={12}>
-          <IconButton aria-label="Toggle search filters" onClick={() => setShowSidebar(false)}>
-            <CloseIcon />
-          </IconButton>
-          <Filters filters={filters} />
+        <Grid container>
+          <Grid item xs={12} style={{ display: 'flex', justifyContent: 'flex-end' }}>
+            <IconButton aria-label="Toggle search filters" onClick={() => setShowSidebar(false)}>
+              <CloseIcon />
+            </IconButton>
+          </Grid>
+          <Grid item xs={12}>
+            <Filters filters={filters} />
+          </Grid>
         </Grid>
       </Drawer>
       <IconButton onClick={() => setShowSidebar(true)} size="small">

src/client/src/pages/projects/header/_submit-project.jsx

@@ -0,0 +1,19 @@
+import SubmitIcon from 'mdi-react/DatabasePlusIcon'
+import Button from '@material-ui/core/Button'
+import { Link } from 'react-router-dom'
+
+export default () => {
+  return (
+    <Button
+      component={Link}
+      to="/projects/submission"
+      disableElevation
+      size="small"
+      variant="contained"
+      color="primary"
+      startIcon={<SubmitIcon size={18} />}
+    >
+      Submit project
+    </Button>
+  )
+}