Add hierarchical locations

client/src/components/AdvisorReports/OrganizationAdvisorsTable.js

@@ -105,7 +105,7 @@ const OrganizationAdvisorsTable = ({
   function filterRows(rows, filterText) {
     const nothingFound = (
       <tr className="nothing-found">
-        <td colSpan="8">No organizations found...</td>
+        <td colSpan="8">No organizations found…</td>
       </tr>
     )
     const filterResult = rows.filter(element => {

client/src/components/AdvisorReports/Toolbar.js

@@ -13,7 +13,7 @@ const Toolbar = ({ onFilterTextInput, onExportButtonClick }) => (
           className="form-control"
           id="advisorSearch"
           type="text"
-          placeholder="Search organizations..."
+          placeholder="Search organizations…"
           onChange={e => onFilterTextInput(e.target.value)}
         />
       </div>

client/src/components/ApprovalSteps.js

@@ -26,7 +26,11 @@ function ApprovalSteps({ approvalSteps }) {
               return (
                 <tr key={pos.uuid}>
                   <td>
-                    <LinkTo modelType="Person" model={pos.person} />
+                    <LinkTo
+                      modelType="Person"
+                      model={pos.person}
+                      whenUnspecified="Unfilled"
+                    />
                   </td>
                   <td>
                     <LinkTo modelType="Position" model={pos} />

client/src/components/EditAssociatedPositionsModal.js

@@ -117,7 +117,7 @@ const EditAssociatedPositionsModal = ({
                       widget={
                         <AdvancedMultiSelect
                           fieldName="associatedPositions"
-                          placeholder={`Search for a ${assignedRole} position...`}
+                          placeholder={`Search for a ${assignedRole} position…`}
                           value={values.associatedPositions}
                           renderSelected={
                             <AssociatedPositionsTable

client/src/components/EditOrganizationsAdministratedModal.js

@@ -91,6 +91,7 @@ const EditOrganizationsAdministratedModal = ({
                                 organizations={
                                   values.organizationsAdministrated || []
                                 }
+                                noOrganizationsMessage="No organizations selected"
                                 showDelete
                               />
                             }

client/src/components/Leaflet.js

@@ -29,6 +29,12 @@ import MARKER_ICON from "resources/leaflet/marker-icon.png"
 import MARKER_SHADOW from "resources/leaflet/marker-shadow.png"
 import Settings from "settings"
 
+export const DEFAULT_MAP_STYLE = {
+  width: "100%",
+  height: "500px",
+  marginBottom: "18px"
+}
+
 const css = {
   zIndex: 1
 }
@@ -289,9 +295,7 @@ Leaflet.propTypes = {
   onMapClick: PropTypes.func
 }
 Leaflet.defaultProps = {
-  width: "100%",
-  height: "500px",
-  marginBottom: "18px"
+  ...DEFAULT_MAP_STYLE
 }
 
 export default Leaflet

client/src/components/LocationTable.js

@@ -6,6 +6,7 @@ import {
   PageDispatchersPropType,
   useBoilerplate
 } from "components/Page"
+import RemoveButton from "components/RemoveButton"
 import UltimatePaginationTopDown from "components/UltimatePaginationTopDown"
 import _get from "lodash/get"
 import { Location } from "models"
@@ -91,13 +92,14 @@ const BaseLocationTable = ({
   showDelete,
   onDelete,
   locations,
+  noLocationsMessage,
   pageSize,
   pageNum,
   totalCount,
   goToPage
 }) => {
   if (_get(locations, "length", 0) === 0) {
-    return <em>No locations found</em>
+    return <em>{noLocationsMessage}</em>
   }
 
   return (
@@ -115,6 +117,7 @@ const BaseLocationTable = ({
             <tr>
               <th>Name</th>
               <th>Type</th>
+              {showDelete && <th />}
             </tr>
           </thead>
           <tbody>
@@ -124,6 +127,14 @@ const BaseLocationTable = ({
                   <LinkTo modelType="Location" model={loc} />
                 </td>
                 <td>{Location.humanNameOfType(loc.type)}</td>
+                {showDelete && (
+                  <td id={"locationDelete_" + loc.uuid}>
+                    <RemoveButton
+                      title="Remove location"
+                      onClick={() => onDelete(loc)}
+                    />
+                  </td>
+                )}
               </tr>
             ))}
           </tbody>
@@ -139,11 +150,16 @@ BaseLocationTable.propTypes = {
   onDelete: PropTypes.func,
   // list of locations:
   locations: PropTypes.array.isRequired,
+  noLocationsMessage: PropTypes.string,
   // fill these when pagination wanted:
   totalCount: PropTypes.number,
   pageNum: PropTypes.number,
   pageSize: PropTypes.number,
   goToPage: PropTypes.func
 }
 
+BaseLocationTable.defaultProps = {
+  noLocationsMessage: "No locations found"
+}
+
 export default connect(null, mapPageDispatchersToProps)(LocationTable)

client/src/components/OrganizationTable.js

@@ -95,6 +95,7 @@ const BaseOrganizationTable = ({
   showDelete,
   onDelete,
   organizations,
+  noOrganizationsMessage,
   pageSize,
   pageNum,
   totalCount,
@@ -107,7 +108,7 @@ const BaseOrganizationTable = ({
   toggleSelection
 }) => {
   if (_get(organizations, "length", 0) === 0) {
-    return <em>No organizations found</em>
+    return <em>{noOrganizationsMessage}</em>
   }
 
   return (
@@ -190,6 +191,7 @@ BaseOrganizationTable.propTypes = {
   onDelete: PropTypes.func,
   // list of organizations:
   organizations: PropTypes.array,
+  noOrganizationsMessage: PropTypes.string,
   // fill these when pagination wanted:
   totalCount: PropTypes.number,
   pageNum: PropTypes.number,
@@ -204,4 +206,8 @@ BaseOrganizationTable.propTypes = {
   toggleSelection: PropTypes.func
 }
 
+BaseOrganizationTable.defaultProps = {
+  noOrganizationsMessage: "No organizations found"
+}
+
 export default connect(null, mapPageDispatchersToProps)(OrganizationTable)

client/src/components/PlanningConflictForPerson.js

@@ -50,7 +50,7 @@ const BasePlanningConflictForPerson = ({ person, report, iconOnly }) => {
 
   if (loading) {
     return (
-      <Tooltip content="Checking for planning conflicts...">
+      <Tooltip content="Checking for planning conflicts…">
         <Spinner intent={Intent.WARNING} size={20} />
       </Tooltip>
     )