refactor(condo): DOMA-6883 remove old Alert component (#3722)

Author: nomerdvadcatpyat

apps/condo/domains/common/components/Alert.tsx

@@ -67,15 +67,14 @@ export const getAddressDetails = (property: ObjectWithAddressInfo) => {
     const regionNamePosition = regionWithType && regionWithType.split(' ')[0] === regionName ? 0 : 1
     const regionWithFullType = (regionType) ? (regionNamePosition === 0 ? `${regionName} ${regionType}` : `${regionType} ${regionName}`) : `${regionName}`
 
-    const cityWithType = get(addressMeta, 'city_with_type')
+    const cityPart = get(addressMeta, 'city_with_type')
     const cityName = get(addressMeta, 'city')
 
     const settlementPart = get(addressMeta, 'settlement_with_type')
 
     const settlement = streetWithType ? streetWithType : settlementPart
     const streetPart = settlement && `${settlement}, ${houseNamePrefix}${houseName}${houseNameSuffix}`
     const regionPart = regionName && regionName !== cityName && regionWithFullType
-    const cityPart = cityWithType && cityWithType
 
     const areaWithType = get(addressMeta, 'area_with_type')
     const areaPart = areaWithType && areaWithType !== cityPart && areaWithType

apps/condo/domains/common/utils/helpers.ts

@@ -10,9 +10,8 @@ import { useApolloClient } from '@open-condo/next/apollo'
 import { useAuth } from '@open-condo/next/auth'
 import { useIntl } from '@open-condo/next/intl'
 import { useOrganization } from '@open-condo/next/organization'
-import { ActionBar, Button } from '@open-condo/ui'
+import { ActionBar, Alert, Button } from '@open-condo/ui'
 
-import { Alert } from '@condo/domains/common/components/Alert'
 import Input from '@condo/domains/common/components/antd/Input'
 import { FormWithAction } from '@condo/domains/common/components/containers/FormList'
 import LoadingOrErrorPage from '@condo/domains/common/components/containers/LoadingOrErrorPage'

apps/condo/domains/organization/components/EmployeeForm/UpdateEmployeeForm.tsx

@@ -56,9 +56,11 @@ export const useTableColumns = (
     const renderSpecializations = useCallback((employee) => {
         const { SpecializationsMessage } = getEmployeeSpecializationsMessage(intl, employee, organizationEmployeeSpecializations)
 
+        if (!SpecializationsMessage) return null
+
         return (
             <Typography.Paragraph key={employee.id} style={TEXT_STYLES}>
-                {SpecializationsMessage && SpecializationsMessage}
+                {SpecializationsMessage}
             </Typography.Paragraph>
         )
     }, [intl, organizationEmployeeSpecializations])

apps/condo/domains/organization/hooks/useTableColumns.tsx

@@ -2,8 +2,8 @@ import { Typography } from 'antd'
 import React, { CSSProperties, useMemo } from 'react'
 
 import { useIntl } from '@open-condo/next/intl'
+import { Alert } from '@open-condo/ui'
 
-import { Alert } from '@condo/domains/common/components/Alert'
 import { useTracking } from '@condo/domains/common/components/TrackingContext'
 
 const ALERT_MESSAGE_STYLE: CSSProperties = { color: 'inherit', marginBottom: '4px' }