TS-936 Municipality

- Fix after review
island-is · Jan 9, 2025 · e53196f · e53196f
1 parent d302107
commit e53196f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/apps/skilavottord/web/auth/utils.ts b/apps/skilavottord/web/auth/utils.ts
@@ -12,6 +12,7 @@ type Page =
 
 export const hasDeveloperRole = (role: Role | undefined) =>
   role === Role.developer
+
 export const hasMunicipalityRole = (role: Role | undefined) =>
   role === Role.municipality
 

diff --git a/...ilavottord/web/screens/AccessControl/components/AccessControlModal/AccessControlModal.tsx b/...ilavottord/web/screens/AccessControl/components/AccessControlModal/AccessControlModal.tsx
@@ -40,7 +40,6 @@ interface AccessControlModalProps
   nationalIdDisabled?: boolean
   partnerIdRequired?: boolean
   municipalities?: Option[]
-
   currentPartner?: AccessControl
 }
 

diff --git a/...avottord/web/screens/RecyclingCompanies/RecyclingCompanyUpdate/RecyclingCompanyUpdate.tsx b/...avottord/web/screens/RecyclingCompanies/RecyclingCompanyUpdate/RecyclingCompanyUpdate.tsx
@@ -2,7 +2,7 @@ import { useMutation, useQuery } from '@apollo/client'
 import gql from 'graphql-tag'
 import NextLink from 'next/link'
 import { useRouter } from 'next/router'
-import React, { FC, useContext } from 'react'
+import React, { FC, useContext, useEffect } from 'react'
 import { useForm } from 'react-hook-form'
 
 import {
@@ -126,7 +126,7 @@ const RecyclingCompanyUpdate: FC<React.PropsWithChildren<unknown>> = () => {
   let activeSection = 2
   let route = routes.recyclingCompanies.baseRoute
 
-  React.useEffect(() => {
+  useEffect(() => {
     setValue('isMunicipality', isMunicipalityPage)
   }, [isMunicipalityPage, setValue])
 

diff --git a/...d/web/screens/RecyclingCompanies/components/RecyclingCompanyForm/RecyclingCompanyForm.tsx b/...d/web/screens/RecyclingCompanies/components/RecyclingCompanyForm/RecyclingCompanyForm.tsx
@@ -206,7 +206,6 @@ const RecyclingCompanyForm: FC<
               />
             </GridColumn>
           </GridRow>
-
           <GridRow>
             <GridColumn
               span={['12/12', '12/12', '12/12', '6/12']}
@@ -284,7 +283,6 @@ const RecyclingCompanyForm: FC<
               />
             </GridColumn>
           </GridRow>
-
           {!isMunicipalityPage && (
             <GridRow>
               <GridColumn span="12/12">
@@ -344,7 +342,7 @@ const RecyclingCompanyForm: FC<
               />
             </GridColumn>
           </GridRow>
-          <div
+          <Box
             style={{
               display:
                 user?.role && hasDeveloperRole(user.role) ? 'block' : 'none',
@@ -369,7 +367,7 @@ const RecyclingCompanyForm: FC<
                 />
               </GridColumn>
             </GridRow>
-          </div>
+          </Box>
         </Stack>
       </GridContainer>
       <Box display="flex" justifyContent="spaceBetween" marginTop={7}>

diff --git a/apps/skilavottord/ws/src/app/modules/accessControl/accessControl.service.ts b/apps/skilavottord/ws/src/app/modules/accessControl/accessControl.service.ts
@@ -39,7 +39,6 @@ export class AccessControlService {
     // Get all sub recycling partners of the municipality
     // else get all
     if (partnerId) {
-      // Get all sub recycling partners of the municipality
       const subRecyclingPartners = await RecyclingPartnerModel.findAll({
         where: { municipalityId: partnerId },
       })