Delete non-realtime staff attendance support from employee-mobile

espoon-voltti · Dec 16, 2024 · 3f1b53b · 3f1b53b
1 parent 246b1a6
commit 3f1b53b
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 998 deletions.
diff --git a/frontend/src/e2e-test/pages/mobile/staff-page.ts b/frontend/src/e2e-test/pages/mobile/staff-page.ts
@@ -20,91 +20,6 @@ import {
   TextInput
 } from '../../utils/page'
 
-export default class StaffPage {
-  #staffCount: Element
-  #staffOtherCount: Element
-  #cancelButton: Element
-  #confirmButton: Element
-  #occupancyRealized: Element
-  #updated: Element
-  constructor(readonly page: Page) {
-    this.#staffCount = page.findByDataQa('staff-count')
-    this.#staffOtherCount = page.findByDataQa('staff-other-count')
-    this.#cancelButton = page.findByDataQa('cancel-button')
-    this.#confirmButton = page.findByDataQa('confirm-button')
-    this.#occupancyRealized = page.findByDataQa('realized-occupancy')
-    this.#updated = page.findByDataQa('updated')
-  }
-
-  private countButton(parent: Element, which: 'plus' | 'minus') {
-    return parent.find(`[data-qa="${which}-button"]`)
-  }
-
-  get staffCount() {
-    return this.#staffCount.find('[data-qa="value"]').text
-  }
-
-  get staffOtherCount() {
-    return this.#staffOtherCount.find('[data-qa="value"]').text
-  }
-
-  async incDecButtonsVisible(): Promise<boolean[]> {
-    return Promise.all(
-      [this.#staffCount, this.#staffOtherCount]
-        .map((parent) =>
-          (['plus', 'minus'] as const).map((which) =>
-            this.countButton(parent, which)
-          )
-        )
-        .flat()
-        .map((el) => el.visible)
-    )
-  }
-
-  async incStaffCount() {
-    return this.countButton(this.#staffCount, 'plus').click()
-  }
-
-  async decStaffCount() {
-    return this.countButton(this.#staffCount, 'minus').click()
-  }
-
-  async incStaffOtherCount() {
-    return this.countButton(this.#staffOtherCount, 'plus').click()
-  }
-
-  async decStaffOtherCount() {
-    return this.countButton(this.#staffOtherCount, 'minus').click()
-  }
-
-  async cancel() {
-    return this.#cancelButton.click()
-  }
-
-  async confirm() {
-    return this.#confirmButton.click()
-  }
-
-  get buttonsDisabled() {
-    return Promise.all([
-      this.#cancelButton.disabled,
-      this.#confirmButton.disabled
-    ]).then(([cancel, confirm]) => cancel && confirm)
-  }
-
-  get buttonsEnabled() {
-    return this.buttonsDisabled.then((disabled) => !disabled)
-  }
-
-  get updated() {
-    return this.#updated.text
-  }
-
-  get occupancy() {
-    return this.#occupancyRealized.text
-  }
-}
-
 export class StaffAttendancePage {
   editButton: Element
   previousAttendancesButton: Element

diff --git a/frontend/src/e2e-test/specs/6_mobile/staff.spec.ts b/frontend/src/e2e-test/specs/6_mobile/staff.spec.ts
diff --git a/frontend/src/employee-mobile-frontend/App.tsx b/frontend/src/employee-mobile-frontend/App.tsx
@@ -61,7 +61,6 @@ import PairingWizard from './pairing/PairingWizard'
 import { queryClient, QueryClientProvider } from './query'
 import { RememberContext, RememberContextProvider } from './remember'
 import { SettingsPage } from './settings/SettingsPage'
-import StaffPage from './staff/StaffPage'
 import ExternalStaffMemberPage from './staff-attendance/ExternalStaffMemberPage'
 import MarkExternalStaffMemberArrivalPage from './staff-attendance/MarkExternalStaffMemberArrivalPage'
 import StaffAttendanceEditPage from './staff-attendance/StaffAttendanceEditPage'
@@ -212,10 +211,6 @@ function GroupRouter({ unitId }: { unitId: DaycareId }) {
           path="child-attendance/*"
           element={<ChildAttendanceRouter unitOrGroup={unitOrGroup} />}
         />
-        <Route
-          path="staff/*"
-          element={<StaffRouter unitOrGroup={unitOrGroup} />}
-        />
         <Route
           path="staff-attendance/*"
           element={<StaffAttendanceRouter unitOrGroup={unitOrGroup} />}
@@ -305,14 +300,6 @@ function ChildRouter({ unitId }: { unitId: DaycareId }) {
   )
 }
 
-function StaffRouter({ unitOrGroup }: { unitOrGroup: UnitOrGroup }) {
-  return (
-    <Routes>
-      <Route index element={<StaffPage unitOrGroup={unitOrGroup} />} />
-    </Routes>
-  )
-}
-
 function StaffAttendanceRouter({ unitOrGroup }: { unitOrGroup: UnitOrGroup }) {
   return (
     <Routes>
@@ -449,9 +436,6 @@ export const routes = {
   childSensitiveInfo(unitId: UUID, child: UUID): Uri {
     return uri`${this.child(unitId, child)}/info`
   },
-  staff(unitOrGroup: UnitOrGroup): Uri {
-    return uri`${this.unitOrGroup(unitOrGroup)}/staff`
-  },
   staffAttendanceRoot(unitOrGroup: UnitOrGroup): Uri {
     return uri`${this.unitOrGroup(unitOrGroup)}/staff-attendance`
   },

diff --git a/frontend/src/employee-mobile-frontend/common/BottomNavbar.tsx b/frontend/src/employee-mobile-frontend/common/BottomNavbar.tsx
@@ -140,26 +140,23 @@ export default function BottomNavbar({
               />
             </BottomText>
           </Button>
-          <Button data-qa="bottomnav-staff">
-            <BottomText
-              text={i18n.common.staff}
-              selected={selected === 'staff'}
-              onClick={() =>
-                selected !== 'staff' &&
-                navigate(
-                  (unit.features.includes('REALTIME_STAFF_ATTENDANCE')
-                    ? routes.staffAttendances(unitOrGroup, 'absent')
-                    : routes.staff(unitOrGroup)
-                  ).value
-                )
-              }
-            >
-              <CustomIcon
-                icon={selected === 'staff' ? fasUser : faUser}
+          {unit.features.includes('REALTIME_STAFF_ATTENDANCE') ? (
+            <Button data-qa="bottomnav-staff">
+              <BottomText
+                text={i18n.common.staff}
                 selected={selected === 'staff'}
-              />
-            </BottomText>
-          </Button>
+                onClick={() =>
+                  selected !== 'staff' &&
+                  navigate(routes.staffAttendances(unitOrGroup, 'absent').value)
+                }
+              >
+                <CustomIcon
+                  icon={selected === 'staff' ? fasUser : faUser}
+                  selected={selected === 'staff'}
+                />
+              </BottomText>
+            </Button>
+          ) : null}
           {unit.features.includes('MOBILE_MESSAGING') ? (
             <Button data-qa="bottomnav-messages">
               <BottomText

diff --git a/frontend/src/employee-mobile-frontend/generated/api-clients/daycare.ts b/frontend/src/employee-mobile-frontend/generated/api-clients/daycare.ts