feature: resolving minor issues (github copilot comments) (PIN-9520)

__mocks__/data/eservice.mocks.ts

@@ -46,7 +46,7 @@ const createMockEServiceDescriptorCatalog = createMockFactory<CatalogEServiceDes
   agreementApprovalPolicy: 'MANUAL',
   audience: ['Lorem'],
   dailyCallsPerConsumer: 1,
-  dailyCallsTotal: 1,
+  dailyCallsTotal: 2,
   description: 'Lorem',
   docs: [],
   eservice: {
@@ -132,7 +132,7 @@ const createMockEServiceDescriptorProvider = createMockFactory<ProducerEServiceD
   agreementApprovalPolicy: 'MANUAL',
   audience: ['nikon'],
   dailyCallsPerConsumer: 1,
-  dailyCallsTotal: 1,
+  dailyCallsTotal: 2,
   description: 'kinoin',
   docs: [],
   eservice: {
@@ -179,7 +179,7 @@ const createMockEServiceDescriptorProviderNoInterface =
     agreementApprovalPolicy: 'MANUAL',
     audience: ['nikon'],
     dailyCallsPerConsumer: 1,
-    dailyCallsTotal: 1,
+    dailyCallsTotal: 2,
     description: 'kinoin',
     docs: [],
     eservice: {
@@ -218,7 +218,7 @@ const createMockEServiceDescriptorProviderWithRiskAnalysis =
     agreementApprovalPolicy: 'MANUAL',
     audience: ['nikon'],
     dailyCallsPerConsumer: 1,
-    dailyCallsTotal: 1,
+    dailyCallsTotal: 2,
     description: 'kinoin',
     docs: [],
     eservice: {
@@ -267,7 +267,7 @@ const createMockEServiceDescriptorProviderWithDocs = createMockFactory<ProducerE
   agreementApprovalPolicy: 'MANUAL',
   audience: ['nikon'],
   dailyCallsPerConsumer: 1,
-  dailyCallsTotal: 1,
+  dailyCallsTotal: 2,
   description: 'kinoin',
   docs: [
     {
@@ -314,7 +314,7 @@ const createMockEServiceDescriptorProviderWithTemplateRef =
     agreementApprovalPolicy: 'MANUAL',
     audience: ['nikon'],
     dailyCallsPerConsumer: 1,
-    dailyCallsTotal: 1,
+    dailyCallsTotal: 2,
     description: 'kinoin',
     docs: [],
     eservice: {
@@ -365,7 +365,7 @@ const createMockEServiceDescriptorReceive = createMockFactory<ProducerEServiceDe
   agreementApprovalPolicy: 'MANUAL',
   audience: ['nikon'],
   dailyCallsPerConsumer: 1,
-  dailyCallsTotal: 1,
+  dailyCallsTotal: 2,
   description: 'kinoin',
   docs: [],
   eservice: {

__mocks__/data/purpose.mocks.ts

@@ -299,7 +299,7 @@ const createMockPurposeCallsTotalExceed = createMockFactory<Purpose>({
     dailyCalls: 2,
   },
   dailyCallsPerConsumer: 10,
-  dailyCallsTotal: 1,
+  dailyCallsTotal: 11,
 })
 
 const createMockPurposeCallsWithoutExceed = createMockFactory<Purpose>({

src/components/layout/containers/AttributeContainer.tsx

@@ -67,7 +67,7 @@ export const AttributeContainer = <
         {checked && <CheckCircleIcon sx={{ color: 'success.dark' }} />}
         {onRemove && (
           <IconButton
-            aria-label={t('removeAttributeAriaLabel', { name: attribute.name })}
+            aria-label={t('removeAttributeAriaLabel', { attributeName: attribute.name })}
             onClick={onRemove.bind(null, attribute.id, attribute.name)}
             color={'error' as unknown as 'primary'}
           >

src/components/shared/CustomizeThresholdDrawer.tsx

@@ -53,6 +53,9 @@ export const CustomizeThresholdDrawer: React.FC<CustomizeThresholdDrawerProps> =
   const { t } = useTranslation('eservice', {
     keyPrefix: 'create.step2.attributes.customizeThresholdDrawer',
   })
+  const { t: tThreshold } = useTranslation('eservice', {
+    keyPrefix: 'create.step2.thresholdSection',
+  })
   const formMethods = useForm<CustomizeThresholdFormValues>({
     defaultValues: {
       threshold: attribute?.dailyCallsPerConsumer,
@@ -105,6 +108,8 @@ export const CustomizeThresholdDrawer: React.FC<CustomizeThresholdDrawerProps> =
                     message: t('field.error'),
                   },
                 }),
+                validate: (value) =>
+                  Number.isInteger(Number(value)) || tThreshold('validation.integer'),
               }}
             />
             <GreyAlert>

src/components/shared/DelegationTooltip.tsx

@@ -1,7 +1,7 @@
 import { type DelegationWithCompactTenants } from '@/api/api.generatedTypes'
 import { AuthHooks } from '@/api/auth'
 import { AltRoute } from '@mui/icons-material'
-import { Tooltip } from '@mui/material'
+import { Stack, Tooltip } from '@mui/material'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -23,14 +23,16 @@ export const DelegationTooltip: React.FC<DelegationTooltipProps> = ({ delegation
 
   return (
     <Tooltip title={label}>
-      <AltRoute
-        color="primary"
-        sx={{
-          rotate: '90deg',
-          height: 18,
-          width: 18,
-        }}
-      />
+      <Stack component={'span'} tabIndex={0} aria-label={label}>
+        <AltRoute
+          color="primary"
+          sx={{
+            rotate: '90deg',
+            height: 18,
+            width: 18,
+          }}
+        />
+      </Stack>
     </Tooltip>
   )
 }

src/components/shared/EserviceTemplate/EServiceTemplateTechnicalInfoSection.tsx

@@ -7,7 +7,6 @@ import { useTranslation } from 'react-i18next'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { EServiceTemplateQueries } from '@/api/eserviceTemplate'
 import { EServiceTemplateMutations } from '@/api/eserviceTemplate'
-import { EServiceTemplateThresholdsSection } from './EServiceTemplateThresholdsSection'
 import { EServiceTemplateDocumentationSection } from './EServiceTemplateDocumentationSection'
 import { EServiceTemplateUsefulLinksSection } from './EServiceTemplateUsefulLinksSection'
 import { UpdateVoucherDrawer } from '@/components/shared/UpdateVoucherDrawer'
@@ -18,11 +17,10 @@ import EditIcon from '@mui/icons-material/Edit'
 type EServiceTemplateTechnicalInfoSectionProps = {
   readonly: boolean
   routeKey: 'SUBSCRIBE_ESERVICE_TEMPLATE_DETAILS' | 'PROVIDE_ESERVICE_TEMPLATE_DETAILS'
-  hideThresholds?: boolean
 }
 export const EServiceTemplateTechnicalInfoSection: React.FC<
   EServiceTemplateTechnicalInfoSectionProps
-> = ({ readonly, routeKey, hideThresholds = false }) => {
+> = ({ readonly, routeKey }) => {
   const { t } = useTranslation('eserviceTemplate', {
     keyPrefix: 'read.sections.technicalInformations',
   })
@@ -94,15 +92,6 @@ export const EServiceTemplateTechnicalInfoSection: React.FC<
             content={`${voucherLifespan}`}
           />
         </SectionContainer>
-        {!hideThresholds && (
-          <>
-            <Divider />
-            <EServiceTemplateThresholdsSection
-              readonly={readonly}
-              eserviceTemplate={eserviceTemplate}
-            />
-          </>
-        )}
         <Divider />
         <EServiceTemplateDocumentationSection
           readonly={readonly}

src/components/shared/EserviceTemplate/__tests__/EServiceTemplateTechnicalInfoSection.test.tsx

@@ -90,43 +90,6 @@ describe('EServiceTemplateTechnicalInfoSection', () => {
     expect(screen.getByText('thresholds.voucherLifespan.label')).toBeInTheDocument()
   })
 
-  it('renders thresholds section when hideThresholds is false', () => {
-    const mockData = createMockEServiceTemplateVersionDetails()
-    useSuspenseQueryMock.mockReturnValue({ data: mockData })
-
-    renderWithApplicationContext(
-      <EServiceTemplateTechnicalInfoSection
-        readonly={false}
-        routeKey="PROVIDE_ESERVICE_TEMPLATE_DETAILS"
-      />,
-      {
-        withReactQueryContext: true,
-        withRouterContext: true,
-      }
-    )
-
-    expect(screen.getByTestId('thresholds-section')).toBeInTheDocument()
-  })
-
-  it('hides thresholds section when hideThresholds is true', () => {
-    const mockData = createMockEServiceTemplateVersionDetails()
-    useSuspenseQueryMock.mockReturnValue({ data: mockData })
-
-    renderWithApplicationContext(
-      <EServiceTemplateTechnicalInfoSection
-        readonly={false}
-        routeKey="PROVIDE_ESERVICE_TEMPLATE_DETAILS"
-        hideThresholds
-      />,
-      {
-        withReactQueryContext: true,
-        withRouterContext: true,
-      }
-    )
-
-    expect(screen.queryByTestId('thresholds-section')).not.toBeInTheDocument()
-  })
-
   it('renders voucher section with title and edit button when not readonly', () => {
     const mockData = createMockEServiceTemplateVersionDetails()
     useSuspenseQueryMock.mockReturnValue({ data: mockData })

src/components/shared/EserviceTemplate/index.ts

@@ -4,5 +4,4 @@ export * from './EServiceTemplateTechnicalInfoSection'
 export * from './EServiceTemplateDocumentationSection'
 export * from './EServiceTemplateUsefulLinksSection'
 export * from './EServiceTemplateUpdateDocumentationDrawer'
-export * from './EServiceTemplateThresholdsAndAttributes'
 export * from './EServiceTemplateVersionSelectorDrawer'

src/components/shared/PurposeCreateContext.tsx

@@ -9,7 +9,7 @@ type PurposeCreateContextType = {
 
 const { useContext, Provider } = createContext<PurposeCreateContextType>('PurposeCreateContext', {})
 
-type PurposeCreateContextProviderProps = {
+export type PurposeCreateContextProviderProps = {
   children: React.ReactNode
   type?: PurposeType
   isFromPurposeTemplate?: boolean

src/components/shared/UpdateDailyCallsDrawer.tsx

@@ -45,6 +45,10 @@ export const UpdateDailyCallsDrawer: React.FC<UpdateDailyCallsDrawerProps> = ({
   const { t } = useTranslation('eservice', {
     keyPrefix: 'read.drawers.updateDailyCallsDrawer',
   })
+
+  const { t: tThreshold } = useTranslation('eservice', {
+    keyPrefix: 'create.step2.thresholdSection',
+  })
   const { t: tCommon } = useTranslation('common')
 
   const defaultValues = {
@@ -113,6 +117,8 @@ export const UpdateDailyCallsDrawer: React.FC<UpdateDailyCallsDrawerProps> = ({
               rules={{
                 required: true,
                 min: 1,
+                validate: (value) =>
+                  Number.isInteger(Number(value)) || tThreshold('validation.integer'),
               }}
             />
             <RHFTextField
@@ -124,6 +130,7 @@ export const UpdateDailyCallsDrawer: React.FC<UpdateDailyCallsDrawerProps> = ({
               rules={{
                 required: true,
                 validate: (value) => {
+                  if (!Number.isInteger(Number(value))) return tThreshold('validation.integer')
                   const minValue = formMethods.getValues('dailyCallsPerConsumer') + 1
                   return value >= minValue || t('dailyCallsTotalField.validation.min')
                 },