scheduled acl

Author: Joosakur

frontend/src/employee-frontend/components/employees/DaycareRolesModal.tsx

@@ -57,6 +57,7 @@ const form = transformed(
   object({
     daycareTree: array(treeNode()),
     role: required(oneOf<UserRole>()),
+    startDate: required(localDate()),
     endDate: localDate()
   }),
   (res) => {
@@ -67,9 +68,13 @@ const form = transformed(
 
     if (daycareIds.length === 0) return ValidationError.of('required')
 
+    if (res.endDate && res.endDate.isBefore(res.startDate))
+      return ValidationError.field('endDate', 'dateTooEarly')
+
     return ValidationSuccess.of<UpsertEmployeeDaycareRolesRequest>({
       daycareIds,
       role: res.role,
+      startDate: res.startDate,
       endDate: res.endDate ?? null
     })
   }
@@ -119,14 +124,17 @@ export default React.memo(function DaycareRolesModal({
           label: i18n.roles.adRoles[r]
         }))
       },
+      startDate: localDate.fromDate(LocalDate.todayInHelsinkiTz(), {
+        minDate: LocalDate.todayInHelsinkiTz()
+      }),
       endDate: localDate.fromDate(null, {
         minDate: LocalDate.todayInHelsinkiTz()
       })
     }),
     i18n.validationErrors
   )
 
-  const { daycareTree, role, endDate } = useFormFields(boundForm)
+  const { daycareTree, role, startDate, endDate } = useFormFields(boundForm)
 
   return (
     <MutateFormModal
@@ -152,6 +160,10 @@ export default React.memo(function DaycareRolesModal({
           <Label>{i18n.employees.editor.unitRoles.role}</Label>
           <SelectF bind={role} />
         </FixedSpaceColumn>
+        <FixedSpaceColumn spacing="xs">
+          <Label>{i18n.employees.editor.unitRoles.startDate}</Label>
+          <DatePickerF bind={startDate} locale={lang} />
+        </FixedSpaceColumn>
         <FixedSpaceColumn spacing="xs">
           <Label>{i18n.employees.editor.unitRoles.endDate}</Label>
           <DatePickerF bind={endDate} locale={lang} />

frontend/src/employee-frontend/components/employees/EmployeePage.tsx

@@ -40,6 +40,7 @@ import DaycareRolesModal from './DaycareRolesModal'
 import {
   deleteEmployeeDaycareRolesMutation,
   deleteEmployeeMobileDeviceMutation,
+  deleteEmployeeScheduledDaycareRoleMutation,
   employeeDetailsQuery,
   updateEmployeeGlobalRolesMutation
 } from './queries'
@@ -113,6 +114,12 @@ const EmployeePage = React.memo(function EmployeePage({
     [employee.daycareRoles]
   )
 
+  const sortedScheduledRoles = useMemo(
+    () =>
+      sortBy(employee.scheduledDaycareRoles, ({ daycareName }) => daycareName),
+    [employee.scheduledDaycareRoles]
+  )
+
   return (
     <div>
       {rolesModalOpen && (
@@ -212,6 +219,54 @@ const EmployeePage = React.memo(function EmployeePage({
           ))}
         </Tbody>
       </Table>
+
+      <Gap />
+
+      <Title size={3}>
+        {i18n.employees.editor.unitRoles.scheduledRolesTitle}
+      </Title>
+      <Table>
+        <Thead>
+          <Tr>
+            <Th>{i18n.employees.editor.unitRoles.unit}</Th>
+            <Th>{i18n.employees.editor.unitRoles.role}</Th>
+            <Th>{i18n.employees.editor.unitRoles.startDate}</Th>
+            <Th>{i18n.employees.editor.unitRoles.endDate}</Th>
+            <Th />
+          </Tr>
+        </Thead>
+        <Tbody>
+          {sortedScheduledRoles.map(
+            ({ daycareId, daycareName, role, startDate, endDate }) => (
+              <Tr key={`${daycareId}/${role}`}>
+                <Td>
+                  <Link to={`/units/${daycareId}`}>{daycareName}</Link>
+                </Td>
+                <Td>{i18n.roles.adRoles[role]}</Td>
+                <Td>{startDate.format()}</Td>
+                <Td>{endDate?.format() ?? '-'}</Td>
+                <Td>
+                  <ConfirmedMutation
+                    buttonStyle="ICON"
+                    icon={faTrash}
+                    buttonAltText={i18n.common.remove}
+                    confirmationTitle={
+                      i18n.employees.editor.unitRoles.deleteConfirm
+                    }
+                    mutation={deleteEmployeeScheduledDaycareRoleMutation}
+                    onClick={() => ({
+                      id: employee.id,
+                      daycareId: daycareId
+                    })}
+                    disabled={editingGlobalRoles}
+                  />
+                </Td>
+              </Tr>
+            )
+          )}
+        </Tbody>
+      </Table>
+
       <Gap />
 
       <Title size={3}>{i18n.employees.editor.mobile.title}</Title>

frontend/src/employee-frontend/components/employees/queries.ts

@@ -11,6 +11,7 @@ import {
   createSsnEmployee,
   deactivateEmployee,
   deleteEmployeeDaycareRoles,
+  deleteEmployeeScheduledDaycareRole,
   getEmployeeDetails,
   searchEmployees,
   updateEmployeeGlobalRoles,
@@ -38,6 +39,11 @@ export const deleteEmployeeDaycareRolesMutation = q.mutation(
   [searchEmployeesQuery.prefix, ({ id }) => employeeDetailsQuery({ id })]
 )
 
+export const deleteEmployeeScheduledDaycareRoleMutation = q.mutation(
+  deleteEmployeeScheduledDaycareRole,
+  [searchEmployeesQuery.prefix, ({ id }) => employeeDetailsQuery({ id })]
+)
+
 export const deleteEmployeeMobileDeviceMutation = q.parametricMutation<{
   employeeId: EmployeeId
 }>()(deleteMobileDevice, [

frontend/src/employee-frontend/components/unit/queries.ts

@@ -32,6 +32,7 @@ import {
   getDaycareAcl,
   getDaycares,
   getGroups,
+  getScheduledDaycareAcl,
   getTemporaryEmployee,
   getTemporaryEmployees,
   getUnitGroupDetails,
@@ -77,12 +78,15 @@ export const unitQuery = q.query(getDaycare)
 
 export const unitAclQuery = q.query(getDaycareAcl)
 
+export const unitScheduledAclQuery = q.query(getScheduledDaycareAcl)
+
 export const temporaryEmployeeQuery = q.query(getTemporaryEmployee)
 
 export const temporaryEmployeesQuery = q.query(getTemporaryEmployees)
 
 export const addFullAclForRoleMutation = q.mutation(addFullAclForRole, [
-  ({ unitId }) => unitAclQuery({ unitId })
+  ({ unitId }) => unitAclQuery({ unitId }),
+  ({ unitId }) => unitScheduledAclQuery({ unitId })
 ])
 export const createTemporaryEmployeeMutation = q.mutation(
   createTemporaryEmployee,

frontend/src/employee-frontend/components/unit/tab-unit-information/UnitAccessControl.tsx

@@ -17,6 +17,7 @@ import {
   DaycareAclRow,
   DaycareId,
   EmployeeId,
+  ScheduledDaycareAclRow,
   UserRole
 } from 'lib-common/generated/api-types/shared'
 import {
@@ -57,7 +58,8 @@ import {
   deleteUnitSupervisorMutation,
   reactivateTemporaryEmployeeMutation,
   temporaryEmployeesQuery,
-  unitAclQuery
+  unitAclQuery,
+  unitScheduledAclQuery
 } from '../queries'
 
 import AddAclModal from './acl-modals/AddAclModal'
@@ -73,6 +75,17 @@ export type DaycareAclRole = Extract<
   | 'EARLY_CHILDHOOD_EDUCATION_SECRETARY'
 >
 
+const roleOrder = (role: UserRole) =>
+  role === 'UNIT_SUPERVISOR'
+    ? 0
+    : role === 'SPECIAL_EDUCATION_TEACHER'
+      ? 1
+      : role === 'EARLY_CHILDHOOD_EDUCATION_SECRETARY'
+        ? 2
+        : role === 'STAFF'
+          ? 3
+          : 999 // not expected
+
 function GroupListing({
   unitGroups,
   groupIds
@@ -238,14 +251,7 @@ function AclTable({
       orderBy(
         rows.filter((row) => !row.employee.temporary),
         [
-          (row) =>
-            row.role === 'UNIT_SUPERVISOR'
-              ? 0
-              : row.role === 'SPECIAL_EDUCATION_TEACHER'
-                ? 1
-                : row.role === 'EARLY_CHILDHOOD_EDUCATION_SECRETARY'
-                  ? 2
-                  : 3,
+          (row) => roleOrder(row.role),
           (row) => row.employee.firstName,
           (row) => row.employee.lastName
         ]
@@ -282,6 +288,52 @@ function AclTable({
   )
 }
 
+function ScheduledAclTable({ rows }: { rows: ScheduledDaycareAclRow[] }) {
+  const { i18n } = useTranslation()
+
+  const orderedRows = useMemo(
+    () =>
+      orderBy(rows, [
+        (row) => roleOrder(row.role),
+        (row) => row.firstName,
+        (row) => row.lastName
+      ]),
+    [rows]
+  )
+
+  return (
+    <Table data-qa="scheduled-acl-table">
+      <Thead>
+        <Tr>
+          <Th>{i18n.unit.accessControl.role}</Th>
+          <Th>{i18n.common.form.name}</Th>
+          <Th>{i18n.unit.accessControl.aclStartDate}</Th>
+          <Th>{i18n.unit.accessControl.aclEndDate}</Th>
+        </Tr>
+      </Thead>
+      <Tbody>
+        {orderedRows.map((row) => (
+          <Tr key={row.id} data-qa={`scheduled-acl-row-${row.id}`}>
+            <Td>
+              <span data-qa="role">{i18n.roles.adRoles[row.role]}</span>
+            </Td>
+            <Td>
+              <FixedSpaceColumn spacing="zero">
+                <span data-qa="name">
+                  {formatName(row.firstName, row.lastName, i18n)}
+                </span>
+                <EmailSpan data-qa="email">{row.email}</EmailSpan>
+              </FixedSpaceColumn>
+            </Td>
+            <Td>{row.startDate.format()}</Td>
+            <Td>{row.endDate?.format()}</Td>
+          </Tr>
+        ))}
+      </Tbody>
+    </Table>
+  )
+}
+
 function TemporaryEmployeesTable({
   unitId,
   unitGroups,
@@ -490,6 +542,9 @@ export default React.memo(function UnitAccessControl({
 
   const employees = useQueryResult(getEmployeesQuery())
   const daycareAclRows = useQueryResult(unitAclQuery({ unitId }))
+  const scheduledDaycareAclRows = useQueryResult(
+    unitScheduledAclQuery({ unitId })
+  )
   const temporaryEmployees = useQueryResult(
     permittedActions.includes('READ_TEMPORARY_EMPLOYEE')
       ? temporaryEmployeesQuery({ unitId })
@@ -627,6 +682,11 @@ export default React.memo(function UnitAccessControl({
 
         <Gap size="XL" />
 
+        <H3 noMargin>{i18n.unit.accessControl.scheduledAclRoles}</H3>
+        {renderResult(scheduledDaycareAclRows, (scheduledDaycareAclRows) => (
+          <ScheduledAclTable rows={scheduledDaycareAclRows} />
+        ))}
+
         <FixedSpaceRow justifyContent="space-between" alignItems="center">
           <H3 noMargin>{i18n.unit.accessControl.temporaryEmployees.title}</H3>
           {permittedActions.includes('CREATE_TEMPORARY_EMPLOYEE') && (

frontend/src/employee-frontend/generated/api-clients/daycare.ts

@@ -38,6 +38,7 @@ import { PreschoolTerm } from 'lib-common/generated/api-types/daycare'
 import { PreschoolTermId } from 'lib-common/generated/api-types/shared'
 import { PreschoolTermRequest } from 'lib-common/generated/api-types/daycare'
 import { PublicUnit } from 'lib-common/generated/api-types/daycare'
+import { ScheduledDaycareAclRow } from 'lib-common/generated/api-types/shared'
 import { ServiceWorkerNote } from 'lib-common/generated/api-types/daycare'
 import { StaffAttendanceForDates } from 'lib-common/generated/api-types/daycare'
 import { StaffAttendanceUpdate } from 'lib-common/generated/api-types/daycare'
@@ -60,6 +61,7 @@ import { deserializeJsonDaycareResponse } from 'lib-common/generated/api-types/d
 import { deserializeJsonEmployee } from 'lib-common/generated/api-types/pis'
 import { deserializeJsonPreschoolTerm } from 'lib-common/generated/api-types/daycare'
 import { deserializeJsonPublicUnit } from 'lib-common/generated/api-types/daycare'
+import { deserializeJsonScheduledDaycareAclRow } from 'lib-common/generated/api-types/shared'
 import { deserializeJsonStaffAttendanceForDates } from 'lib-common/generated/api-types/daycare'
 import { deserializeJsonUnitGroupDetails } from 'lib-common/generated/api-types/daycare'
 import { uri } from 'lib-common/uri'
@@ -858,6 +860,22 @@ export async function getDaycareAcl(
 }
 
 
+/**
+* Generated from fi.espoo.evaka.daycare.controllers.UnitAclController.getScheduledDaycareAcl
+*/
+export async function getScheduledDaycareAcl(
+  request: {
+    unitId: DaycareId
+  }
+): Promise<ScheduledDaycareAclRow[]> {
+  const { data: json } = await client.request<JsonOf<ScheduledDaycareAclRow[]>>({
+    url: uri`/employee/daycares/${request.unitId}/scheduled-acl`.toString(),
+    method: 'GET'
+  })
+  return json.map(e => deserializeJsonScheduledDaycareAclRow(e))
+}
+
+
 /**
 * Generated from fi.espoo.evaka.daycare.controllers.UnitAclController.getTemporaryEmployee
 */

frontend/src/employee-frontend/generated/api-clients/pis.ts

@@ -175,6 +175,27 @@ export async function deleteEmployeeDaycareRoles(
 }
 
 
+/**
+* Generated from fi.espoo.evaka.pis.controllers.EmployeeController.deleteEmployeeScheduledDaycareRole
+*/
+export async function deleteEmployeeScheduledDaycareRole(
+  request: {
+    id: EmployeeId,
+    daycareId: DaycareId
+  }
+): Promise<void> {
+  const params = createUrlSearchParams(
+    ['daycareId', request.daycareId]
+  )
+  const { data: json } = await client.request<JsonOf<void>>({
+    url: uri`/employee/employees/${request.id}/scheduled-daycare-role`.toString(),
+    method: 'DELETE',
+    params
+  })
+  return json
+}
+
+
 /**
 * Generated from fi.espoo.evaka.pis.controllers.EmployeeController.getEmployee
 */