TS-936 Municipality

island-is · Dec 13, 2024 · a2ce8ec · a2ce8ec
1 parent d1108ea
commit a2ce8ec
Show file tree

Hide file tree

Showing 21 changed files with 360 additions and 204 deletions.
diff --git a/apps/skilavottord/web/auth/utils.ts b/apps/skilavottord/web/auth/utils.ts
@@ -15,6 +15,9 @@ export const hasDeveloperRole = (role: Role | undefined) =>
 export const hasMunicipalityRole = (role: Role | undefined) =>
   role === Role.municipality
 
+export const hasRecyclingFundRole = (role: Role | undefined) =>
+  role === Role.recyclingFund
+
 export const hasPermission = (page: Page, role: Role) => {
   if (!role) return false
 

diff --git a/apps/skilavottord/web/i18n/locales/en.json b/apps/skilavottord/web/i18n/locales/en.json
@@ -581,7 +581,10 @@
         },
         "municipality": {
           "label": "Municipality",
-          "placeholder": "Municipality"
+          "placeholder": "Municipality",
+          "rules": {
+            "required": "Municipality is required"
+          }
         }
       },
       "buttons": {

diff --git a/apps/skilavottord/web/i18n/locales/is.json b/apps/skilavottord/web/i18n/locales/is.json
@@ -373,7 +373,7 @@
   },
   "recyclingCompanies": {
     "title": "Móttökuaðilar",
-    "info": "Upplýsingar til að hjálpa viðskiptavinum að hafa samband við móttökuaðila.",
+    "info": "Skráðir móttökuaðilar",
     "empty": "Engin móttökuaðili fannst",
     "subtitles": {
       "companies": "Móttökuaðilar"
@@ -582,6 +582,13 @@
           "rules": {
             "required": "Skylda er að fylla út móttökuaðila"
           }
+        },
+        "municipality": {
+          "label": "Sveitarfélag",
+          "placeholder": "Sveitarfélag",
+          "rules": {
+            "required": "Skylda er að fylla út sveitarfélag"
+          }
         }
       },
       "buttons": {
@@ -643,6 +650,7 @@
   },
   "municipalities": {
     "title": "Sveitarfélög",
+    "empty": "Ekkert sveitarfélag fannst",
     "municipality": {
       "view": {
         "title": "Sveitarfélag",

diff --git a/apps/skilavottord/web/i18n/locales/translation.d.ts b/apps/skilavottord/web/i18n/locales/translation.d.ts
@@ -72,6 +72,7 @@ export interface ModalInputs {
   recyclingLocation: RecyclingLocation
   role: Name
   partner: Name
+  municipality: Name
 }
 
 export interface Email {

diff --git a/apps/skilavottord/web/screens/AccessControl/AccessControl.tsx b/apps/skilavottord/web/screens/AccessControl/AccessControl.tsx
@@ -17,6 +17,7 @@ import {
 } from '@island.is/island-ui/core'
 import {
   hasDeveloperRole,
+  hasMunicipalityRole,
   hasPermission,
 } from '@island.is/skilavottord-web/auth/utils'
 import { NotFound } from '@island.is/skilavottord-web/components'
@@ -41,7 +42,7 @@ import { AccessControlCreate, AccessControlUpdate } from './components'
 
 import NavigationLinks from '@island.is/skilavottord-web/components/NavigationLinks/NavigationLinks'
 import PageHeader from '@island.is/skilavottord-web/components/PageHeader/PageHeader'
-import { SkilavottordAllRecyclingPartnersByTypeQuery } from '../RecyclingCompanies/RecyclingCompanies'
+import { SkilavottordRecyclingPartnersQuery } from '../RecyclingCompanies/RecyclingCompanies'
 import * as styles from './AccessControl.css'
 
 const SkilavottordAllRecyclingPartnersQuery = gql`
@@ -51,6 +52,7 @@ const SkilavottordAllRecyclingPartnersQuery = gql`
       companyName
       active
       municipalityId
+      isMunicipality
     }
   }
 `
@@ -67,6 +69,7 @@ const SkilavottordAccessControlsQuery = gql`
         companyId
         companyName
         municipalityId
+        isMunicipality
       }
     }
   }
@@ -82,9 +85,11 @@ export const CreateSkilavottordAccessControlMutation = gql`
       role
       email
       phone
+      partnerId
       recyclingPartner {
         companyId
         companyName
+        municipalityId
       }
     }
   }
@@ -138,9 +143,12 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
       error: recyclingPartnerByIdError,
       loading: recyclingPartnerByIdLoading,
     },
-  ] = useLazyQuery<Query>(SkilavottordAllRecyclingPartnersByTypeQuery, {
+  ] = useLazyQuery<Query>(SkilavottordRecyclingPartnersQuery, {
     ssr: false,
-    variables: { isMunicipality: false, municipalityId: user?.partnerId },
+    variables: {
+      isMunicipalityPage: false,
+      municipalityId: user?.partnerId,
+    },
   })
 
   const {
@@ -220,21 +228,34 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
 
   const partners =
     recyclingPartnerData?.skilavottordAllRecyclingPartners ||
-    recyclingPartnerByIdData?.skilavottordAllRecyclingPartnersByType ||
+    recyclingPartnerByIdData?.skilavottordRecyclingPartners ||
     []
-  const recyclingPartners = filterInternalPartners(partners).map((partner) => ({
-    label: partner.municipalityId
-      ? `${partner.municipalityId} - ${partner.companyName}`
-      : partner.companyName,
-    value: partner.companyId,
-  }))
+  const recyclingPartners = filterInternalPartners(partners)
+    .filter((partner) => {
+      return !partner.isMunicipality
+    })
+    .map((partner) => ({
+      label: partner.municipalityId
+        ? `${partner.municipalityId} - ${partner.companyName}`
+        : partner.companyName,
+      value: partner.companyId,
+    }))
+
+  const municipalities = filterInternalPartners(partners)
+    .filter((partner) => {
+      return partner.isMunicipality
+    })
+    .map((partner) => ({
+      label: partner.companyName,
+      value: partner.companyId,
+    }))
 
   const roles = Object.keys(AccessControlRole)
     .filter((role) =>
       !hasDeveloperRole(user?.role) ? role !== Role.developer : role,
     )
     .filter((role) => {
-      if (user.role == Role.municipality) {
+      if (hasMunicipalityRole(Role.municipality)) {
         return (
           role === Role.recyclingCompany ||
           role === Role.recyclingCompanyAdmin ||
@@ -253,7 +274,7 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
     setIsCreateAccessControlModalVisible(false)
 
   const handleCreateAccessControlOpenModal = () => {
-    if (user.role === Role.municipality) {
+    if (hasMunicipalityRole(user?.role)) {
       getAllRecyclingPartnersByMunicipality()
     } else {
       getAllRecyclingPartner()
@@ -323,6 +344,7 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
             onCancel={handleCreateAccessControlCloseModal}
             onSubmit={handleCreateAccessControl}
             recyclingPartners={recyclingPartners}
+            municipalities={municipalities}
             roles={roles}
           />
         </Box>
@@ -384,7 +406,14 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
                         items={[
                           {
                             title: t.buttons.edit,
-                            onClick: () => setPartner(item),
+                            onClick: () => {
+                              if (hasMunicipalityRole(user?.role)) {
+                                getAllRecyclingPartnersByMunicipality()
+                              } else {
+                                getAllRecyclingPartner()
+                              }
+                              setPartner(item)
+                            },
                           },
                           {
                             title: t.buttons.delete,
@@ -438,6 +467,7 @@ const AccessControl: FC<React.PropsWithChildren<unknown>> = () => {
         recyclingPartners={recyclingPartners}
         roles={roles}
         currentPartner={partner}
+        municipalities={municipalities}
       />
     </PartnerPageLayout>
   )

diff --git a/...avottord/web/screens/AccessControl/components/AccessControlCreate/AccessControlCreate.tsx b/...avottord/web/screens/AccessControl/components/AccessControlCreate/AccessControlCreate.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import React, { FC, useContext, useEffect } from 'react'
 import { useForm } from 'react-hook-form'
 
 import { Option } from '@island.is/island-ui/core'
@@ -9,6 +9,8 @@ import {
 } from '@island.is/skilavottord-web/graphql/schema'
 
 import { AccessControlModal } from '../AccessControlModal/AccessControlModal'
+import { UserContext } from '@island.is/skilavottord-web/context'
+import { hasMunicipalityRole } from '@island.is/skilavottord-web/auth/utils'
 
 interface AccessControlCreateProps
   extends Omit<
@@ -18,12 +20,25 @@ interface AccessControlCreateProps
   onSubmit: (partner: CreateAccessControlInput) => Promise<void>
   recyclingPartners: Option[]
   roles: Option[]
+  municipalities: Option[]
 }
 
 export const AccessControlCreate: FC<
   React.PropsWithChildren<AccessControlCreateProps>
-> = ({ title, text, show, onCancel, onSubmit, recyclingPartners, roles }) => {
+> = ({
+  title,
+  text,
+  show,
+  onCancel,
+  onSubmit,
+  recyclingPartners,
+  roles,
+  municipalities,
+}) => {
+  const { user } = useContext(UserContext)
+
   const {
+    reset,
     control,
     handleSubmit,
     watch,
@@ -32,19 +47,38 @@ export const AccessControlCreate: FC<
     mode: 'onChange',
   })
 
+  const getPartnerId = (
+    municipalityId: string,
+    partnerId: string,
+    role: Role,
+  ) => {
+    // If the user has municipality role, then he can only create a new access under the same municipality
+    if (hasMunicipalityRole(user?.role) && hasMunicipalityRole(role)) {
+      return user.partnerId
+    }
+
+    // If selected role is municipality, use municipalityId, else use partnerId
+    return hasMunicipalityRole(role) ? municipalityId : partnerId || null
+  }
+
   const handleOnSubmit = handleSubmit(
-    ({ nationalId, name, role, partnerId, email, phone }) => {
+    ({ nationalId, name, role, partnerId, email, phone, municipalityId }) => {
       return onSubmit({
         nationalId,
         name,
         phone,
         email,
         role: role.value,
-        partnerId: partnerId?.value,
+        partnerId: getPartnerId(municipalityId, partnerId, role),
       })
     },
   )
 
+  useEffect(() => {
+    // clear the form if re-opened
+    reset()
+  }, [show, reset])
+
   return (
     <AccessControlModal
       title={title}
@@ -53,10 +87,14 @@ export const AccessControlCreate: FC<
       onCancel={onCancel}
       onSubmit={handleOnSubmit}
       recyclingPartners={recyclingPartners}
+      municipalities={municipalities}
       roles={roles}
       control={control}
       errors={errors}
-      partnerIdRequired={watch('role')?.value === Role.recyclingCompanyAdmin}
+      partnerIdRequired={
+        watch('role')?.value === Role.recyclingCompanyAdmin ||
+        watch('role')?.value === Role.recyclingCompany
+      }
     />
   )
 }