Merge pull request #552 from codeforpdx/cleanup-v10-2

Cleaning up v0.10.0 in prep for v0.11.0 upgrade
codeforpdx · Nov 30, 2023 · 5ec692a · 5ec692a
2 parents 6eac717 + f583e6e
commit 5ec692a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 23 deletions.
diff --git a/src/components/CivicProfileForms/HousingInfo.jsx b/src/components/CivicProfileForms/HousingInfo.jsx
@@ -1,7 +1,9 @@
 // React Imports
 import React, { useState, useEffect } from 'react';
 // MUI Imports
-import { TextField, Button } from '@mui/material';
+import Button from '@mui/material/Button';
+import TextField from '@mui/material/TextField';
+// Custom Hooks Imports
 import { useCivicProfile } from '@hooks';
 
 /**

diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
@@ -0,0 +1,3 @@
+import Footer from './Footer';
+
+export default Footer;
diff --git a/src/constants/HMIS_ONTOLOGY_VALUES.js b/src/constants/HMIS_ONTOLOGY_VALUES.js
@@ -1,10 +1,10 @@
 const prefix = 'urn:hud:hmis:owl#';
 
 const HMIS_ONTOLOGY_VALUES = {
-  legalFirstName: 'urn:hud:hmis:owl#FirstName',
-  legalLastName: 'urn:hud:hmis:owl#LastName',
-  legalDOB: 'urn:hud:hmis:owl#DOB',
-  legalGender: 'urn:hud:hmis:owl#Gender',
+  legalFirstName: `${prefix}FirstName`,
+  legalLastName: `${prefix}LastName`,
+  legalDOB: `${prefix}DOB`,
+  legalGender: `${prefix}Gender`,
   lastPermanentCity: `${prefix}LastPermanentCity`,
   lastPermanentState: `${prefix}LastPermanentState`,
   lastPermanentStreet: `${prefix}LastPermanentStreet`,

diff --git a/src/hooks/useCivicProfile.js b/src/hooks/useCivicProfile.js
@@ -10,52 +10,50 @@ import { RDF_PREDICATES } from '@constants';
 import useSession from './useSession';
 import useRdfCollection from './useRdfCollection';
 
-const prefix = 'urn:hud:hmis:owl#';
-
 const civicProfileConfig = {
   firstName: {
     type: 'string',
-    predicate: `${prefix}FirstName`
+    predicate: RDF_PREDICATES.legalFirstName
   },
   lastName: {
     type: 'string',
-    predicate: `${prefix}LastName`
+    predicate: RDF_PREDICATES.legalLastName
   },
   dateOfBirth: {
     type: 'date',
-    predicate: `${prefix}DOB`
+    predicate: RDF_PREDICATES.legalDOB
   },
   gender: {
     type: 'number',
-    predicate: `${prefix}Gender`
+    predicate: RDF_PREDICATES.legalGender
   },
   lastPermanentCity: {
     type: 'string',
-    predicate: `${prefix}LastPermanentCity`
+    predicate: RDF_PREDICATES.lastPermanentCity
   },
   lastPermanentState: {
     type: 'string',
-    predicate: `${prefix}LastPermanentState`
+    predicate: RDF_PREDICATES.lastPermanentState
   },
   lastPermanentStreet: {
     type: 'string',
-    predicate: `${prefix}LastPermanentStreet`
+    predicate: RDF_PREDICATES.lastPermanentStreet
   },
   lastPermanentZIP: {
     type: 'string',
-    predicate: `${prefix}LastPermanentZIP`
+    predicate: RDF_PREDICATES.lastPermanentZIP
   },
   monthsHomeless: {
     type: 'number',
-    predicate: `${prefix}MonthsHomelessPast3Years`
+    predicate: RDF_PREDICATES.monthsHomeless
   },
   timesHomeless: {
     type: 'number',
-    predicate: `${prefix}TimesHomelessPast3Years`
+    predicate: RDF_PREDICATES.timesHomeless
   },
   timeToHousingLoss: {
     type: 'number',
-    predicate: `${prefix}TimeToHousingLoss`
+    predicate: RDF_PREDICATES.timeToHousingLoss
   }
 };
 

diff --git a/src/layouts/Layout.jsx b/src/layouts/Layout.jsx
@@ -7,9 +7,9 @@ import Box from '@mui/material/Box';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTheme } from '@mui/system';
 // Component Imports
-import { NavBar } from '../components/NavBar';
-import { InactivityMessage, NotificationContainer } from '../components/Notification';
-import Footer from '../components/Footer/Footer';
+import { InactivityMessage, NotificationContainer } from '@components/Notification';
+import { NavBar } from '@components/NavBar';
+import Footer from '@components/Footer';
 import Breadcrumbs from './Breadcrumbs';
 
 const Layout = ({ ariaLabel, children }) => {

diff --git a/src/pages/Messages.jsx b/src/pages/Messages.jsx
@@ -6,8 +6,8 @@ import { useMessageList } from '@hooks';
 import Box from '@mui/material/Box';
 // Context Imports
 // Component Imports
-import { NewMessageModal } from '../components/Modals';
-import { MessageButtonGroup, MessageFolder } from '../components/Messages';
+import { NewMessageModal } from '@components/Modals';
+import { MessageButtonGroup, MessageFolder } from '@components/Messages';
 
 /**
  * Messages Page - Page that generates the components for the Message system
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import Footer from './Footer';

		export default Footer;