Skip to content

Commit

Permalink
Bump prettier from 3.0.1 to 3.1.1
Browse files Browse the repository at this point in the history
Bumps [prettier](https://github.com/prettier/prettier) from 3.0.1 to 3.1.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.0.1...3.1.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and cgsunkel committed Jan 2, 2024
1 parent 25ce698 commit e257948
Show file tree
Hide file tree
Showing 25 changed files with 102 additions and 103 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) =>
Expand Down
12 changes: 6 additions & 6 deletions src/apps/companies/apps/edit-company/client/CompanyMatched.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
</FieldUneditable>

<FieldUneditable
Expand All @@ -48,8 +48,8 @@ const CompanyMatched = ({
{!company.number_of_employees && !company.employee_range
? 'Not set'
: company.number_of_employees
? company.number_of_employees.toString()
: company.employee_range.name}
? company.number_of_employees.toString()
: company.employee_range.name}
</FieldUneditable>

{isOnOneList ? (
Expand Down
4 changes: 2 additions & 2 deletions src/apps/interactions/client/transformers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions src/client/components/ActivityFeed/activities/InteractionUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
5 changes: 2 additions & 3 deletions src/client/components/Analytics/saga.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
16 changes: 8 additions & 8 deletions src/client/components/CompanyLists/Table.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ const Advisers = ({ ditParticipants }) =>
ditParticipants.length === 0
? 'Unknown adviser - Unknown team'
: ditParticipants.length > 1
? 'Multiple advisers'
: ditParticipants.map((adviser, index) => (
<div key={index}>
{`${adviser.name || 'Unknown adviser'} - ${
adviser.team || 'Unknown team'
}`}
</div>
))
? 'Multiple advisers'
: ditParticipants.map((adviser, index) => (
<div key={index}>
{`${adviser.name || 'Unknown adviser'} - ${
adviser.team || 'Unknown team'
}`}
</div>
))

const CompaniesTable = ({ companies }) => (
<Table
Expand Down
4 changes: 2 additions & 2 deletions src/client/components/ContactLocalHeader/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ const getCurrentTab = (currentPath) =>
currentPath.includes('/interactions')
? 'Activity'
: currentPath.includes('/audit')
? 'Audit history'
: null
? 'Audit history'
: null

const currentTab = getCurrentTab(path)

Expand Down
30 changes: 15 additions & 15 deletions src/client/components/LocalHeader/FlashMessages.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,21 @@ const FlashMessages = ({
return isNull(messages[0])
? null
: parts.length > 1
? messages.map(({ body, heading }) => (
<li key={body}>
<StyledStatusMessage colour={messageColours[parts[0]]}>
<StyledHeading>{heading}</StyledHeading>
<StyledBody dangerouslySetInnerHTML={{ __html: body }} />
</StyledStatusMessage>
</li>
))
: messages.map((body, i) => (
<li key={i}>
<StyledStatusMessage colour={messageColours[type]}>
<StyledMessage dangerouslySetInnerHTML={{ __html: body }} />
</StyledStatusMessage>
</li>
))
? messages.map(({ body, heading }) => (
<li key={body}>
<StyledStatusMessage colour={messageColours[parts[0]]}>
<StyledHeading>{heading}</StyledHeading>
<StyledBody dangerouslySetInnerHTML={{ __html: body }} />
</StyledStatusMessage>
</li>
))
: messages.map((body, i) => (
<li key={i}>
<StyledStatusMessage colour={messageColours[type]}>
<StyledMessage dangerouslySetInnerHTML={{ __html: body }} />
</StyledStatusMessage>
</li>
))
})}
</UnorderedList>
) : null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ const InvestmentEstimatedLandDate = ({ estimatedLandDate, ...props }) => {
difference >= 90
? GreenPanel
: difference >= 30
? AmberPanel
: difference >= 0
? RedPanel
: GreyPanel
? AmberPanel
: difference >= 0
? RedPanel
: GreyPanel

return (
<Panel data-test="estimated-land-date" {...props}>
Expand Down
10 changes: 5 additions & 5 deletions src/client/components/TabNav/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/client/modules/Companies/CompanyHierarchy/CompanyTree.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
</>
)

Expand Down
4 changes: 2 additions & 2 deletions src/client/modules/Companies/CoreTeam/transformers.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export const transformOneListCoreTeamToCollection = (advisers) => {
location: adviserTeam?.ukRegion
? adviserTeam?.ukRegion.name
: adviserTeam?.country
? adviserTeam?.country.name
: '-',
? adviserTeam?.country.name
: '-',
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand All @@ -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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions src/client/modules/Omis/OMISLocalHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
12 changes: 6 additions & 6 deletions src/client/modules/Omis/WorkOrderTables/InvoiceDetailsTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/client/modules/Omis/transformers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) =>
[
Expand Down
8 changes: 4 additions & 4 deletions src/client/modules/Reminders/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading

0 comments on commit e257948

Please sign in to comment.