Add room and convert to room and various other things

src/_nav.jsx

@@ -625,7 +625,7 @@ const _nav = [
     component: CNavGroup,
     name: 'Administration',
     section: 'Email & Exchange',
-    to: '/email/exchange',
+    to: '/email/Administration',
     icon: <FontAwesomeIcon icon={faWrench} className="nav-icon" />,
     items: [
       {
@@ -688,7 +688,7 @@ const _nav = [
     component: CNavGroup,
     name: 'Transport',
     section: 'Email & Exchange',
-    to: '/tenant/administration',
+    to: '/email/Transport',
     icon: <FontAwesomeIcon icon={faBus} className="nav-icon" />,
     items: [
       {
@@ -727,7 +727,7 @@ const _nav = [
     component: CNavGroup,
     name: 'Spamfilter',
     section: 'Email & Exchange',
-    to: '/tenant/administration',
+    to: '/email/spamfilter',
     icon: <FontAwesomeIcon icon={faEnvelope} className="nav-icon" />,
     items: [
       {
@@ -749,20 +749,20 @@ const _nav = [
   },
   {
     component: CNavGroup,
-    name: ' Room Management',
+    name: 'Resource Management',
     section: 'Email & Exchange',
-    to: '/rooms/management',
+    to: '/resources/management',
     icon: <FontAwesomeIcon icon={faToolbox} className="nav-icon" />,
     items: [
       {
         component: CNavItem,
         name: 'Rooms',
-        to: '/rooms/management/list-rooms',
+        to: '/resources/management/list-rooms',
       },
       {
         component: CNavItem,
         name: 'Room Lists',
-        to: '/rooms/management/room-lists',
+        to: '/resources/management/room-lists',
       },
     ],
   },

src/importsMap.jsx

@@ -107,8 +107,9 @@ import React from 'react'
   "/email/spamfilter/list-spamfilter": React.lazy(() => import('./views/email-exchange/spamfilter/Spamfilter')), 
   "/email/spamfilter/deploy": React.lazy(() => import('./views/email-exchange/spamfilter/DeploySpamfilter')), 
   "/email/spamfilter/list-templates": React.lazy(() => import('./views/email-exchange/spamfilter/ListSpamfilterTemplates')), 
-  "/rooms/management/list-rooms": React.lazy(() => import('./views/email-exchange/rooms/ListRooms')), 
-  "/rooms/management/room-lists": React.lazy(() => import('./views/email-exchange/rooms/ListRoomLists')), 
+  "/resources/management/list-rooms": React.lazy(() => import('./views/email-exchange/rooms/ListRooms')), 
+  "/resources/management/room-lists": React.lazy(() => import('./views/email-exchange/rooms/ListRoomLists')), 
+  "/resources/management/add-room": React.lazy(() => import('./views/email-exchange/rooms/AddRoomMailbox')), 
   "/email/tools/mailbox-restore-wizard": React.lazy(() => import('./views/email-exchange/tools/MailboxRestoreWizard')), 
   "/email/tools/mailbox-restores": React.lazy(() => import('./views/email-exchange/tools/MailboxRestores')), 
   "/email/tools/mail-test": React.lazy(() => import('./views/email-exchange/tools/MailTest')), 
@@ -118,7 +119,7 @@ import React from 'react'
   "/email/administration/add-contact": React.lazy(() => import('./views/email-exchange/administration/AddContact')), 
   "/email/administration/edit-calendar-permissions": React.lazy(() => import('./views/email-exchange/administration/EditCalendarPermissions')), 
   "/email/administration/view-mobile-devices": React.lazy(() => import('./views/email-exchange/administration/ViewMobileDevices')), 
-  "/email/administration/edit-contact": React.lazy(() => import('./views/email-exchange/administration/EditContact.jsx')),
+  "/email/administration/edit-contact": React.lazy(() => import('./views/email-exchange/administration/EditContact')), 
   "/email/administration/mailboxes": React.lazy(() => import('./views/email-exchange/administration/MailboxesList')), 
   "/email/administration/deleted-mailboxes": React.lazy(() => import('./views/email-exchange/administration/DeletedMailboxes')), 
   "/email/administration/mailbox-rules": React.lazy(() => import('./views/email-exchange/administration/MailboxRuleList')), 

src/routes.json

@@ -729,17 +729,23 @@
     "allowedRoles": ["admin", "editor", "readonly"]
   },
   {
-    "path": "/rooms/management/list-rooms",
+    "path": "/resources/management/list-rooms",
     "name": "Rooms",
     "component": "views/email-exchange/rooms/ListRooms",
     "allowedRoles": ["admin", "editor", "readonly"]
   },
   {
-    "path": "/rooms/management/room-lists",
+    "path": "/resources/management/room-lists",
     "name": "Room Lists",
     "component": "views/email-exchange/rooms/ListRoomLists",
     "allowedRoles": ["admin", "editor", "readonly"]
   },
+  {
+    "path": "/resources/management/add-room",
+    "name": "Add Room",
+    "component": "views/email-exchange/rooms/AddRoomMailbox",
+    "allowedRoles": ["admin", "editor", "readonly"]
+  },
   {
     "path": "/email/tools/mailbox-restore-wizard",
     "name": "Mailbox Restore Wizard",

src/views/email-exchange/administration/MailboxesList.jsx

@@ -86,15 +86,21 @@ const MailboxList = () => {
               color: 'info',
               modal: true,
               modalUrl: `/api/ExecConvertToSharedMailbox?TenantFilter=${tenant.defaultDomainName}&ID=${row.UPN}`,
-              modalMessage: 'Are you sure you want to convert this user to a shared mailbox?',
+              modalMessage: 'Are you sure you want to convert this mailbox to a shared mailbox?',
             },
             {
               label: 'Convert to User Mailbox',
               color: 'info',
               modal: true,
               modalUrl: `/api/ExecConvertToSharedMailbox?TenantFilter=${tenant.defaultDomainName}&ID=${row.UPN}&ConvertToUser=true`,
-              modalMessage:
-                'Are you sure you want to convert this shared mailbox to a user mailbox?',
+              modalMessage: 'Are you sure you want to convert this mailbox to a user mailbox?',
+            },
+            {
+              label: 'Convert to Room Mailbox',
+              color: 'info',
+              modal: true,
+              modalUrl: `/api/ExecConvertToRoomMailbox?TenantFilter=${tenant.defaultDomainName}&ID=${row.UPN}`,
+              modalMessage: 'Are you sure you want to convert this mailbox to a Room mailbox?',
             },
             {
               label: 'Copy Sent Items to Shared Mailbox',
@@ -231,14 +237,22 @@ const MailboxList = () => {
       maxWidth: '150px',
     },
   ]
-  const titleButton = (
-    <TitleButton href="/email/administration/add-shared-mailbox" title="Add Shared Mailbox" />
+
+  const titleButtons = (
+    <div style={{ display: 'flex', alignItems: 'right' }}>
+      <div style={{ marginLeft: '10px' }}>
+        <TitleButton href="/email/administration/add-shared-mailbox" title="Add Shared Mailbox" />
+      </div>
+      <div style={{ marginLeft: '10px' }}>
+        <TitleButton href="/resources/management/add-room" title="Add Room" />
+      </div>
+    </div>
   )
 
   return (
     <CippPageList
       capabilities={{ allTenants: false, helpContext: 'https://google.com' }}
-      titleButton={titleButton}
+      titleButton={titleButtons}
       title="Mailboxes"
       datatable={{
         keyField: 'id',
@@ -253,15 +267,21 @@ const MailboxList = () => {
               color: 'info',
               modal: true,
               modalUrl: `/api/ExecConvertToSharedMailbox?TenantFilter=${tenant.defaultDomainName}&ID=!UPN`,
-              modalMessage: 'Are you sure you want to convert this user to a shared mailbox?',
+              modalMessage: 'Are you sure you want to convert these mailboxes to shared mailboxes?',
             },
             {
               label: 'Convert to User Mailbox',
               color: 'info',
               modal: true,
               modalUrl: `/api/ExecConvertToSharedMailbox?TenantFilter=${tenant.defaultDomainName}&ID=!UPN&ConvertToUser=true`,
-              modalMessage:
-                'Are you sure you want to convert this shared mailbox to a user mailbox?',
+              modalMessage: 'Are you sure you want to convert these mailboxes to user mailboxes?',
+            },
+            {
+              label: 'Convert to Room Mailbox',
+              color: 'info',
+              modal: true,
+              modalUrl: `/api/ExecConvertToRoomMailbox?TenantFilter=${tenant.defaultDomainName}&ID=!UPN`,
+              modalMessage: 'Are you sure you want to convert these mailboxes to Room mailboxes?',
             },
             {
               label: 'Hide from Global Address List',
@@ -334,6 +354,7 @@ const MailboxList = () => {
             filter: '"SharedMailboxWithLicense":true',
           },
           { filterName: 'Shared Mailboxes', filter: '"recipientTypeDetails":"SharedMailbox"' },
+          { filterName: 'Room mailboxes', filter: '"recipientTypeDetails":"RoomMailbox"' },
           { filterName: 'Has an alias', filter: '"AdditionalEmailAddresses":"' },
         ],
       }}

src/views/email-exchange/rooms/AddRoomMailbox.jsx

@@ -0,0 +1,118 @@
+import React from 'react'
+import {
+  CCallout,
+  CButton,
+  CCol,
+  CForm,
+  CRow,
+  CSpinner,
+  CCard,
+  CCardHeader,
+  CCardTitle,
+  CCardBody,
+} from '@coreui/react'
+import { Form } from 'react-final-form'
+import { RFFCFormInput, RFFCFormSelect, RFFCFormTextarea } from 'src/components/forms'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
+import { CippPage } from 'src/components/layout/CippPage'
+import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
+import { useListDomainsQuery } from 'src/store/api/domains'
+import { useSelector } from 'react-redux'
+
+const AddRoomMailbox = () => {
+  const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
+  const {
+    data: domains = [],
+    isFetching: domainsIsFetching,
+    error: domainsError,
+  } = useListDomainsQuery({ tenantDomain })
+
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+  const onSubmit = (values) => {
+    const shippedValues = {
+      tenantID: tenantDomain,
+      domain: values.domain,
+      displayName: values.displayName.trim(),
+      username: values.username.trim(),
+      userPrincipalName: values.username.trim() + '@' + values.domain.trim(),
+      resourceCapacity: values.resourceCapacity ? values.resourceCapacity.trim() : undefined,
+    }
+    // window.alert(JSON.stringify(shippedValues))
+    genericPostRequest({ path: '/api/AddRoomMailbox', values: shippedValues })
+  }
+
+  // TODO: Add functionality to set location, office, floor and other things here
+  return (
+    <CippPage title="Add Room">
+      <CCard className="content-card">
+        <CCardHeader className="d-flex justify-content-between align-items-center">
+          <CCardTitle>Add Room</CCardTitle>
+        </CCardHeader>
+        <CCardBody>
+          <Form
+            onSubmit={onSubmit}
+            render={({ handleSubmit, submitting, values }) => {
+              return (
+                <CForm onSubmit={handleSubmit}>
+                  <CRow>
+                    <CCol md={8}>
+                      <RFFCFormInput type="text" name="displayName" label="Display Name" />
+                    </CCol>
+                  </CRow>
+                  <CRow>
+                    <CCol md={4}>
+                      <RFFCFormInput type="text" name="username" label="Username" />
+                    </CCol>
+                    <CCol md={4}>
+                      {domainsIsFetching && <CSpinner />}
+                      {!domainsIsFetching && (
+                        <RFFCFormSelect
+                          // label="Domain"
+                          name="domain"
+                          label="Primary Domain name"
+                          placeholder={!domainsIsFetching ? 'Select domain' : 'Loading...'}
+                          values={domains?.map((domain) => ({
+                            value: domain.id,
+                            label: domain.id,
+                          }))}
+                        />
+                      )}
+                      {domainsError && <span>Failed to load list of domains</span>}
+                    </CCol>
+                    <CCol xs={12}>
+                      <RFFCFormInput
+                        type="text"
+                        name="resourceCapacity"
+                        label="Resource Capacity (Optional)"
+                      />
+                    </CCol>
+                  </CRow>
+                  <CRow className="mb-3">
+                    <CCol md={6}>
+                      <CButton type="submit" disabled={submitting}>
+                        Add Room Mailbox
+                        {postResults.isFetching && (
+                          <FontAwesomeIcon icon={faCircleNotch} spin className="ms-2" size="1x" />
+                        )}
+                      </CButton>
+                    </CCol>
+                  </CRow>
+                  {postResults.isSuccess && (
+                    <CCallout color="success">
+                      {postResults.data.Results.map((message, idx) => {
+                        return <li key={idx}>{message}</li>
+                      })}
+                    </CCallout>
+                  )}
+                </CForm>
+              )
+            }}
+          />
+        </CCardBody>
+      </CCard>
+    </CippPage>
+  )
+}
+
+export default AddRoomMailbox

src/views/email-exchange/rooms/ListRoomLists.jsx

@@ -12,7 +12,7 @@ const RoomLists = () => {
   /* const Actions = (row, rowIndex, formatExtraData) => (
     <>
       <Link
-        to={`/rooms/management/list-rooms?tenantDomain=${tenant.defaultDomainName}`}
+        to={`/resources/management/list-rooms?tenantDomain=${tenant.defaultDomainName}`}
       >
         <CButton size="sm" variant="ghost" color="success">
           <FontAwesomeIcon icon={faEye} />

src/views/email-exchange/rooms/ListRooms.jsx

@@ -4,6 +4,7 @@ import { CButton } from '@coreui/react'
 import { faEye, faEdit } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { Link } from 'react-router-dom'
+import { TitleButton } from 'src/components/buttons'
 import { CippPageList } from 'src/components/layout'
 import { CellTip } from 'src/components/tables'
 
@@ -12,15 +13,15 @@ const Rooms = () => {
   /* const Actions = (row, rowIndex, formatExtraData) => (
     <>
       <Link
-        to={`/rooms/management/list-rooms?tenantDomain=${tenant.defaultDomainName}`}
+        to={`/resources/management/list-rooms?tenantDomain=${tenant.defaultDomainName}`}
       >
         <CButton size="sm" variant="ghost" color="success">
           <FontAwesomeIcon icon={faEye} />
         </CButton>
       </Link>
     </>
   )*/
-
+  const titleButton = <TitleButton href="/resources/management/add-room" title="Add Room" />
   const columns = [
     {
       name: 'Name',
@@ -78,6 +79,7 @@ const Rooms = () => {
   return (
     <CippPageList
       title="Rooms"
+      titleButton={titleButton}
       datatable={{
         columns,
         path: '/api/ListRooms',