diff --git a/package-lock.json b/package-lock.json index 02137027009..00cae8be156 100644 --- a/package-lock.json +++ b/package-lock.json @@ -150,7 +150,7 @@ "npm-run-all": "^4.1.5", "nyc": "15.1.0", "pre-commit": "^1.2.2", - "prettier": "3.0.1", + "prettier": "3.1.1", "proxyquire": "^2.1.3", "reqres": "^3.0.1", "rewire": "^6.0.0", @@ -25236,9 +25236,9 @@ } }, "node_modules/prettier": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", - "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/package.json b/package.json index 2cd049da76a..69d3f126d9c 100644 --- a/package.json +++ b/package.json @@ -209,7 +209,7 @@ "npm-run-all": "^4.1.5", "nyc": "15.1.0", "pre-commit": "^1.2.2", - "prettier": "3.0.1", + "prettier": "3.1.1", "proxyquire": "^2.1.3", "reqres": "^3.0.1", "rewire": "^6.0.0", diff --git a/src/apps/companies/apps/business-details/client/SectionOneList.jsx b/src/apps/companies/apps/business-details/client/SectionOneList.jsx index 851c4184bb5..ed4291e01a0 100644 --- a/src/apps/companies/apps/business-details/client/SectionOneList.jsx +++ b/src/apps/companies/apps/business-details/client/SectionOneList.jsx @@ -20,8 +20,8 @@ const getLocation = (manager) => { return manager.ditTeam.ukRegion ? manager.ditTeam.ukRegion.name : manager.ditTeam.country - ? manager.ditTeam.country.name - : '-' + ? manager.ditTeam.country.name + : '-' } const SectionOneList = ({ company, isArchived, isDnbCompany }) => diff --git a/src/apps/companies/apps/edit-company/client/CompanyMatched.jsx b/src/apps/companies/apps/edit-company/client/CompanyMatched.jsx index b8e01f4bd76..40df63be628 100644 --- a/src/apps/companies/apps/edit-company/client/CompanyMatched.jsx +++ b/src/apps/companies/apps/edit-company/client/CompanyMatched.jsx @@ -34,10 +34,10 @@ const CompanyMatched = ({ {!company.turnover_gbp && !company.turnover_range ? 'Not set' : company.turnover_gbp - ? currencyGBP(company.turnover_gbp, { - maximumSignificantDigits: 2, - }) - : company.turnover_range.name} + ? currencyGBP(company.turnover_gbp, { + maximumSignificantDigits: 2, + }) + : company.turnover_range.name} {isOnOneList ? ( diff --git a/src/apps/interactions/client/transformers.js b/src/apps/interactions/client/transformers.js index 1d9e3fdfcf0..e9cb3a150cf 100644 --- a/src/apps/interactions/client/transformers.js +++ b/src/apps/interactions/client/transformers.js @@ -16,8 +16,8 @@ const formatParticipantName = (participant) => get(participant, 'adviser') && get(participant, 'team') ? `${participant.adviser.name}, ${participant.team.name}` : get(participant, 'adviser') - ? participant.adviser.name - : 'Unknown adviser' + ? participant.adviser.name + : 'Unknown adviser' const formatParticipants = (dit_participants) => dit_participants.length > 1 diff --git a/src/apps/interactions/transformers/interaction-to-list-item.js b/src/apps/interactions/transformers/interaction-to-list-item.js index df265c572f8..91d2a54320b 100644 --- a/src/apps/interactions/transformers/interaction-to-list-item.js +++ b/src/apps/interactions/transformers/interaction-to-list-item.js @@ -28,8 +28,8 @@ function transformInteractionToListItem(showCompany = true) { get(participant, 'adviser') && get(participant, 'team') ? `${participant.adviser.name}, ${participant.team.name}` : get(participant, 'adviser') - ? participant.adviser.name - : 'Unknown adviser' + ? participant.adviser.name + : 'Unknown adviser' const formatParticipants = (dit_participants) => dit_participants.length > 1 diff --git a/src/client/components/ActivityFeed/CollectionList/transformers.js b/src/client/components/ActivityFeed/CollectionList/transformers.js index 36be9511351..35eb2315d85 100644 --- a/src/client/components/ActivityFeed/CollectionList/transformers.js +++ b/src/client/components/ActivityFeed/CollectionList/transformers.js @@ -19,8 +19,8 @@ const formatParticipantName = (participant) => get(participant, 'adviser') && get(participant, 'team') ? `${participant.adviser.name}, ${participant.team.name}` : get(participant, 'adviser') - ? participant.adviser.name - : 'Unknown adviser' + ? participant.adviser.name + : 'Unknown adviser' const formatParticipants = (dit_participants) => dit_participants.length > 1 diff --git a/src/client/components/ActivityFeed/activities/InteractionUtils.js b/src/client/components/ActivityFeed/activities/InteractionUtils.js index 60cd603b1d3..cfb6e4523d6 100644 --- a/src/client/components/ActivityFeed/activities/InteractionUtils.js +++ b/src/client/components/ActivityFeed/activities/InteractionUtils.js @@ -45,12 +45,12 @@ export const getServiceText = (service) => { service.includes('introductions') ? 'Introduction' : service.includes('Advice & Information') || - service.includes('advice and information') - ? 'Advice and information' - : service.includes('Investment Enquiry') || - service.includes('Investment enquiry') - ? 'Enquiry' - : INTERACTION_SERVICES[serviceType] + service.includes('advice and information') + ? 'Advice and information' + : service.includes('Investment Enquiry') || + service.includes('Investment enquiry') + ? 'Enquiry' + : INTERACTION_SERVICES[serviceType] return serviceText } @@ -67,12 +67,12 @@ const getThemeText = (activity) => { const themeText = includes(themeTypes, 'dit:datahub:theme:export') ? 'export' : includes(themeTypes, 'dit:datahub:theme:investment') - ? 'investment' - : includes(themeTypes, 'dit:datahub:theme:trade_agreement') - ? 'trade agreement' - : includes(themeTypes, 'dit:datahub:theme:other') - ? 'other' - : null + ? 'investment' + : includes(themeTypes, 'dit:datahub:theme:trade_agreement') + ? 'trade agreement' + : includes(themeTypes, 'dit:datahub:theme:other') + ? 'other' + : null return themeText } diff --git a/src/client/components/Analytics/saga.js b/src/client/components/Analytics/saga.js index 8212f13ae81..86825928f1c 100644 --- a/src/client/components/Analytics/saga.js +++ b/src/client/components/Analytics/saga.js @@ -9,9 +9,8 @@ data layer. */ export default function* () { while (true) { - const { category, action, label, extra, event } = yield take( - ANALYTICS__PUSH - ) + const { category, action, label, extra, event } = + yield take(ANALYTICS__PUSH) window.dataLayer = window.dataLayer || [] const data = omitBy( diff --git a/src/client/components/CompanyLists/Table.jsx b/src/client/components/CompanyLists/Table.jsx index 02e47e25b65..2a6e237c1b3 100644 --- a/src/client/components/CompanyLists/Table.jsx +++ b/src/client/components/CompanyLists/Table.jsx @@ -122,14 +122,14 @@ const Advisers = ({ ditParticipants }) => ditParticipants.length === 0 ? 'Unknown adviser - Unknown team' : ditParticipants.length > 1 - ? 'Multiple advisers' - : ditParticipants.map((adviser, index) => ( -
- {`${adviser.name || 'Unknown adviser'} - ${ - adviser.team || 'Unknown team' - }`} -
- )) + ? 'Multiple advisers' + : ditParticipants.map((adviser, index) => ( +
+ {`${adviser.name || 'Unknown adviser'} - ${ + adviser.team || 'Unknown team' + }`} +
+ )) const CompaniesTable = ({ companies }) => ( currentPath.includes('/interactions') ? 'Activity' : currentPath.includes('/audit') - ? 'Audit history' - : null + ? 'Audit history' + : null const currentTab = getCurrentTab(path) diff --git a/src/client/components/LocalHeader/FlashMessages.jsx b/src/client/components/LocalHeader/FlashMessages.jsx index acfaf6decae..87a7875c492 100644 --- a/src/client/components/LocalHeader/FlashMessages.jsx +++ b/src/client/components/LocalHeader/FlashMessages.jsx @@ -78,21 +78,21 @@ const FlashMessages = ({ return isNull(messages[0]) ? null : parts.length > 1 - ? messages.map(({ body, heading }) => ( -
  • - - {heading} - - -
    • - )) - : messages.map((body, i) => ( -
  • - - - -
    • - )) + ? messages.map(({ body, heading }) => ( +
  • + + {heading} + + +
    • + )) + : messages.map((body, i) => ( +
  • + + + +
    • + )) })} ) : null diff --git a/src/client/components/MyInvestmentProjects/InvestmentEstimatedLandDate.jsx b/src/client/components/MyInvestmentProjects/InvestmentEstimatedLandDate.jsx index 1a7ac5008e6..5b406f869b8 100644 --- a/src/client/components/MyInvestmentProjects/InvestmentEstimatedLandDate.jsx +++ b/src/client/components/MyInvestmentProjects/InvestmentEstimatedLandDate.jsx @@ -58,10 +58,10 @@ const InvestmentEstimatedLandDate = ({ estimatedLandDate, ...props }) => { difference >= 90 ? GreenPanel : difference >= 30 - ? AmberPanel - : difference >= 0 - ? RedPanel - : GreyPanel + ? AmberPanel + : difference >= 0 + ? RedPanel + : GreyPanel return ( diff --git a/src/client/components/TabNav/index.jsx b/src/client/components/TabNav/index.jsx index 240a3b035aa..d407890f854 100644 --- a/src/client/components/TabNav/index.jsx +++ b/src/client/components/TabNav/index.jsx @@ -183,8 +183,8 @@ const TabNav = ({ focusIndex !== undefined ? focusIndex : selectedIndex === undefined || foundIndex === -1 - ? 0 - : foundIndex + ? 0 + : foundIndex if (keyCode === RIGHT_ARROW_KEY) { onFocusChange((currentFocusIndex + 1) % totalTabs) @@ -218,9 +218,9 @@ const TabNav = ({ ? // ...only the first tab participates in the tabindex 0 : // Otherwise, only the selected tab participates in tabindex - selected - ? 0 - : -1 + selected + ? 0 + : -1 } onClick={() => { onChange(key, index) diff --git a/src/client/modules/Companies/CompanyHierarchy/CompanyTree.jsx b/src/client/modules/Companies/CompanyHierarchy/CompanyTree.jsx index 4f4b4da7b46..a8d62e0133c 100644 --- a/src/client/modules/Companies/CompanyHierarchy/CompanyTree.jsx +++ b/src/client/modules/Companies/CompanyHierarchy/CompanyTree.jsx @@ -449,8 +449,8 @@ const CompanyNumberOfEmployees = ({ company }) => ( {company.employee_range?.name ? company.employee_range.name : company.number_of_employees - ? company.number_of_employees - : 'Not set'} + ? company.number_of_employees + : 'Not set'} ) diff --git a/src/client/modules/Companies/CoreTeam/transformers.js b/src/client/modules/Companies/CoreTeam/transformers.js index 0c1f177d6f1..774fc5f6119 100644 --- a/src/client/modules/Companies/CoreTeam/transformers.js +++ b/src/client/modules/Companies/CoreTeam/transformers.js @@ -39,8 +39,8 @@ export const transformOneListCoreTeamToCollection = (advisers) => { location: adviserTeam?.ukRegion ? adviserTeam?.ukRegion.name : adviserTeam?.country - ? adviserTeam?.country.name - : '-', + ? adviserTeam?.country.name + : '-', } } diff --git a/src/client/modules/Interactions/CollectionList/transformers.js b/src/client/modules/Interactions/CollectionList/transformers.js index 880c7ddfc30..293d4d2dbef 100644 --- a/src/client/modules/Interactions/CollectionList/transformers.js +++ b/src/client/modules/Interactions/CollectionList/transformers.js @@ -19,8 +19,8 @@ const formatParticipantName = (participant) => get(participant, 'adviser') && get(participant, 'team') ? `${participant.adviser.name}, ${participant.team.name}` : get(participant, 'adviser') - ? participant.adviser.name - : 'Unknown adviser' + ? participant.adviser.name + : 'Unknown adviser' const formatParticipants = (dit_participants) => dit_participants.length > 1 diff --git a/src/client/modules/Interactions/InteractionDetails/transformers.js b/src/client/modules/Interactions/InteractionDetails/transformers.js index 96fcdc75586..78612fbaef5 100644 --- a/src/client/modules/Interactions/InteractionDetails/transformers.js +++ b/src/client/modules/Interactions/InteractionDetails/transformers.js @@ -121,8 +121,8 @@ export const getEditLink = ( interactionId ) : isCompanyPage - ? urls.companies.interactions.edit(companyId, interactionId) - : urls.interactions.edit(interactionId) + ? urls.companies.interactions.edit(companyId, interactionId) + : urls.interactions.edit(interactionId) } export const getDetailsLink = ( @@ -141,6 +141,6 @@ export const getDetailsLink = ( interactionId ) : isCompanyPage - ? urls.companies.interactions.detail(companyId, interactionId) - : urls.interactions.detail(interactionId) + ? urls.companies.interactions.detail(companyId, interactionId) + : urls.interactions.detail(interactionId) } diff --git a/src/client/modules/Investments/Projects/ProjectsCollection.jsx b/src/client/modules/Investments/Projects/ProjectsCollection.jsx index 077e2e3875c..ce21394e748 100644 --- a/src/client/modules/Investments/Projects/ProjectsCollection.jsx +++ b/src/client/modules/Investments/Projects/ProjectsCollection.jsx @@ -127,8 +127,8 @@ const ProjectsCollection = ({ !company ? `/investments/projects/create` : company.archived || company.uk_based - ? null - : `/investments/projects/create/${company.id}` + ? null + : `/investments/projects/create/${company.id}` } sanitizeFiltersForAnalytics={({ advisers, countries }) => ({ ...sanitizeFilter(advisers), diff --git a/src/client/modules/Omis/OMISLocalHeader.jsx b/src/client/modules/Omis/OMISLocalHeader.jsx index fc13b0e764b..ed21d4d9864 100644 --- a/src/client/modules/Omis/OMISLocalHeader.jsx +++ b/src/client/modules/Omis/OMISLocalHeader.jsx @@ -39,8 +39,8 @@ const transformStatus = (order, quote) => { return order.status === STATUS.QUOTE_AWAITING_ACCEPTANCE ? transformedStatus + getExpiryDate(quote.expiresOn) : order.status === STATUS.COMPLETE - ? transformedStatus + getCompletionDate(order.completedOn) - : transformedStatus + ? transformedStatus + getCompletionDate(order.completedOn) + : transformedStatus } const setHeaderItems = (order, quote) => { diff --git a/src/client/modules/Omis/WorkOrderTables/InvoiceDetailsTable.jsx b/src/client/modules/Omis/WorkOrderTables/InvoiceDetailsTable.jsx index ac50cf34a20..ffb0f2f2289 100644 --- a/src/client/modules/Omis/WorkOrderTables/InvoiceDetailsTable.jsx +++ b/src/client/modules/Omis/WorkOrderTables/InvoiceDetailsTable.jsx @@ -25,18 +25,18 @@ const setPrice = (order) => { order.subtotalCost / 100 )} excluding VAT)` : order.discountValue - ? `${formattedPrice} (includes a net discount of ${currencyGBP( - order.discountValue - )})` - : `${formattedPrice} (No VAT applies)` + ? `${formattedPrice} (includes a net discount of ${currencyGBP( + order.discountValue + )})` + : `${formattedPrice} (No VAT applies)` } const transformVATStatus = (vatStatus) => vatStatus === VAT_STATUS.EU_COMPANY ? 'Inside EU' : vatStatus === VAT_STATUS.UK_COMPANY - ? 'Inside UK' - : 'Outside EU' + ? 'Inside UK' + : 'Outside EU' const transformOrderAddress = (company, order) => { const address = getAddress(order, company) diff --git a/src/client/modules/Omis/transformers.js b/src/client/modules/Omis/transformers.js index 857577ed3f8..e4674f34327 100644 --- a/src/client/modules/Omis/transformers.js +++ b/src/client/modules/Omis/transformers.js @@ -175,8 +175,8 @@ export const getAddress = (order, company) => country: order.billingAddressCountry, } : company.registeredAddress - ? company.registeredAddress - : company.address + ? company.registeredAddress + : company.address export const transformAddress = (address) => [ diff --git a/src/client/modules/Reminders/state.js b/src/client/modules/Reminders/state.js index e752832969b..3c2b665306e 100644 --- a/src/client/modules/Reminders/state.js +++ b/src/client/modules/Reminders/state.js @@ -126,10 +126,10 @@ export const state2props = (state) => { hasInvestmentFeatureGroup && hasExportFeatureGroup ? urls.reminders.investments.estimatedLandDate() : hasInvestmentFeatureGroup - ? urls.reminders.investments.estimatedLandDate() - : hasExportFeatureGroup - ? urls.reminders.exports.noRecentInteractions() - : urls.reminders.myTasks.dueDateApproaching() + ? urls.reminders.investments.estimatedLandDate() + : hasExportFeatureGroup + ? urls.reminders.exports.noRecentInteractions() + : urls.reminders.myTasks.dueDateApproaching() return { reminderSummary, diff --git a/src/client/utils/index.js b/src/client/utils/index.js index 1243ec038ce..981f2126775 100644 --- a/src/client/utils/index.js +++ b/src/client/utils/index.js @@ -20,10 +20,10 @@ export const deepKeysToCamelCase = (x) => Array.isArray(x) ? x.map(deepKeysToCamelCase) : isPlainObject(x) - ? Object.fromEntries( - Object.entries(x).map(([k, v]) => [ - camelCase(k), - deepKeysToCamelCase(v), - ]) - ) - : x + ? Object.fromEntries( + Object.entries(x).map(([k, v]) => [ + camelCase(k), + deepKeysToCamelCase(v), + ]) + ) + : x diff --git a/test/sandbox/routes/v4/activity-feed/activity-feed.js b/test/sandbox/routes/v4/activity-feed/activity-feed.js index c90aab5589b..333cca55f6b 100644 --- a/test/sandbox/routes/v4/activity-feed/activity-feed.js +++ b/test/sandbox/routes/v4/activity-feed/activity-feed.js @@ -348,8 +348,8 @@ exports.activityFeed = function (req, res) { company === BEST_EVER_COMPANY ? companyActivities : company === BEST_EVER_COMPANY_2 - ? essInteractionsNoTitle - : dataHubAndExternalActivities + ? essInteractionsNoTitle + : dataHubAndExternalActivities return res.json(activities) }