Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps-dev): bump prettier from 2.8.4 to 3.3.3 #1007

Merged
merged 2 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 20 additions & 73 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"projectOwner": "cevo-public",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"files": ["README.md"],
"imageSize": 100,
"commit": true,
"commitConvention": "none",
Expand All @@ -15,184 +13,133 @@
"name": "Chaoran Chen",
"avatar_url": "https://avatars.githubusercontent.com/u/18666552?v=4",
"profile": "https://github.com/chaoran-chen",
"contributions": [
"code",
"data",
"ideas",
"maintenance",
"platform",
"research",
"infra"
]
"contributions": ["code", "data", "ideas", "maintenance", "platform", "research", "infra"]
},
{
"login": "tanja819",
"name": "tanja819",
"avatar_url": "https://avatars.githubusercontent.com/u/8371380?v=4",
"profile": "https://github.com/tanja819",
"contributions": [
"ideas"
]
"contributions": ["ideas"]
},
{
"login": "SarahNadeau",
"name": "Sarah Nadeau",
"avatar_url": "https://avatars.githubusercontent.com/u/30396464?v=4",
"profile": "https://github.com/SarahNadeau",
"contributions": [
"ideas",
"data",
"code"
]
"contributions": ["ideas", "data", "code"]
},
{
"login": "TKGZ",
"name": "Michael Yared",
"avatar_url": "https://avatars.githubusercontent.com/u/36269621?v=4",
"profile": "https://github.com/TKGZ",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "tehwalris",
"name": "Philippe Voinov",
"avatar_url": "https://avatars.githubusercontent.com/u/1489115?v=4",
"profile": "https://walr.is/",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "ningxie1991",
"name": "ningxie",
"avatar_url": "https://avatars.githubusercontent.com/u/3387698?v=4",
"profile": "https://github.com/ningxie1991",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "corneliusroemer",
"name": "Cornelius Roemer",
"avatar_url": "https://avatars.githubusercontent.com/u/25161793?v=4",
"profile": "https://github.com/corneliusroemer",
"contributions": [
"ideas"
]
"contributions": ["ideas"]
},
{
"login": "DrYak",
"name": "DrYak",
"avatar_url": "https://avatars.githubusercontent.com/u/11413679?v=4",
"profile": "https://github.com/DrYak",
"contributions": [
"data"
]
"contributions": ["data"]
},
{
"login": "gautier-collab",
"name": "gautier-collab",
"avatar_url": "https://avatars.githubusercontent.com/u/55604970?v=4",
"profile": "https://github.com/gautier-collab",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "dameyerdave",
"name": "David Meyer",
"avatar_url": "https://avatars.githubusercontent.com/u/5663605?v=4",
"profile": "https://github.com/dameyerdave",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "anastasia-escher",
"name": "Anastasia Escher",
"avatar_url": "https://avatars.githubusercontent.com/u/52914023?v=4",
"profile": "https://github.com/anastasia-escher",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "theosanderson",
"name": "Theo Sanderson",
"avatar_url": "https://avatars.githubusercontent.com/u/19732295?v=4",
"profile": "http://theo.io/",
"contributions": [
"code",
"ideas"
]
"contributions": ["code", "ideas"]
},
{
"login": "adrian-lison",
"name": "Adrian Lison",
"avatar_url": "https://avatars.githubusercontent.com/u/16266527?v=4",
"profile": "https://github.com/adrian-lison",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "fengelniederhammer",
"name": "Fabian Engelniederhammer",
"avatar_url": "https://avatars.githubusercontent.com/u/92720311?v=4",
"profile": "https://github.com/fengelniederhammer",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "JonasKellerer",
"name": "Jonas Kellerer",
"avatar_url": "https://avatars.githubusercontent.com/u/122305307?v=4",
"profile": "https://github.com/JonasKellerer",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "philipschulz",
"name": "Philip Schulz",
"avatar_url": "https://avatars.githubusercontent.com/u/16674735?v=4",
"profile": "https://github.com/philipschulz",
"contributions": [
"code"
]
"contributions": ["code"]
},
{
"login": "Taepper",
"name": "Taepper",
"avatar_url": "https://avatars.githubusercontent.com/u/25206390?v=4",
"profile": "https://github.com/Taepper",
"contributions": [
"code",
"ideas",
"research"
]
"contributions": ["code", "ideas", "research"]
},
{
"login": "GeorgKreuzmayr",
"name": "GeorgKreuzmayr",
"avatar_url": "https://avatars.githubusercontent.com/u/68595015?v=4",
"profile": "https://github.com/GeorgKreuzmayr",
"contributions": [
"code",
"research"
]
"contributions": ["code", "research"]
},
{
"login": "danielgrittner",
"name": "Daniel Grittner",
"avatar_url": "https://avatars.githubusercontent.com/u/29932077?v=4",
"profile": "https://github.com/danielgrittner",
"contributions": [
"code",
"research"
]
"contributions": ["code", "research"]
}
],
"contributorsPerLine": 7
Expand Down
18 changes: 9 additions & 9 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 @@ -168,7 +168,7 @@
"eslint-plugin-unused-imports": "^2.0.0",
"jest-canvas-mock": "^2.5.0",
"postcss": "^8.4.38",
"prettier": "^2.8.4",
"prettier": "^3.3.3",
"puppeteer": "^19.7.2",
"resize-observer-polyfill": "^1.5.1",
"tailwindcss": "^3.2.7",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
2 changes: 1 addition & 1 deletion public/maintenance.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<title>CoV-Spectrum under maintenance</title>
Expand Down
4 changes: 2 additions & 2 deletions src/components/GridPlot/SequencesOverTimeGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ export const fetchDatePangoLineageCount = async (
data2.push({
...d,
nextcladePangoLineageFullName: d.nextcladePangoLineage
? (await PangoLineageAliasResolverService.findFullName(d.nextcladePangoLineage)) ??
d.nextcladePangoLineage
? ((await PangoLineageAliasResolverService.findFullName(d.nextcladePangoLineage)) ??
d.nextcladePangoLineage)
: null,
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/KnownVariantsList/KnownVariantsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ const Grid = ({
isHorizontal
? 'w-max grid-flow-col overflow-hidden auto-rows-min auto-cols-min'
: isLandingPage
? 'grid-cols-2'
: 'grid-cols-1'
? 'grid-cols-2'
: 'grid-cols-1'
}`}
>
{children}
Expand Down
15 changes: 9 additions & 6 deletions src/components/NucleotideEntropy/calculateEntropy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ const meanEntropy = (posEntropy: PositionEntropy[], sequenceType: SequenceType,
g => gene.startPosition <= parseInt(g.position) && parseInt(g.position) <= gene.endPosition
)
: gene.value === 'All'
? posEntropy
: posEntropy.filter(g => g.position.includes(gene.value));
? posEntropy
: posEntropy.filter(g => g.position.includes(gene.value));
const sum = filteredPos.map(f => f.entropy).reduce((x, a) => x + a, 0);
const count = sequenceType === 'nuc' ? gene.endPosition - gene.startPosition : sumOfGenesLength(gene);
return sum / count;
Expand Down Expand Up @@ -168,7 +168,10 @@ export const weeklyMeanEntropy = (
};

const groupBy = <T, K extends keyof any>(arr: T[], key: (i: T) => K) =>
arr.reduce((groups, item) => {
(groups[key(item)] ||= []).push(item);
return groups;
}, {} as Record<K, T[]>);
arr.reduce(
(groups, item) => {
(groups[key(item)] ||= []).push(item);
return groups;
},
{} as Record<K, T[]>
);
13 changes: 8 additions & 5 deletions src/components/NucleotideEntropy/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,14 @@ function calculateEntropyByTime(
}))
)
.flat()
.reduce((aggregated, weeklyMeanEntropy) => {
const previousValue = aggregated[weeklyMeanEntropy.day] ?? {};
aggregated[weeklyMeanEntropy.day] = { ...previousValue, ...weeklyMeanEntropy };
return aggregated;
}, {} as Record<number, any>);
.reduce(
(aggregated, weeklyMeanEntropy) => {
const previousValue = aggregated[weeklyMeanEntropy.day] ?? {};
aggregated[weeklyMeanEntropy.day] = { ...previousValue, ...weeklyMeanEntropy };
return aggregated;
},
{} as Record<number, any>
);

return Object.values(timeMap);
}
13 changes: 8 additions & 5 deletions src/components/NucleotideEntropy/useMultiChartData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,14 @@ export const useMultiChartData = (
day: week.dateFrom!.dayjs.toDate().getTime(),
[variants[Math.floor(i / weekRangesCount)]]: meanEntropy,
}))
.reduce((aggregated, weeklyMeanEntropy) => {
const previousValue = aggregated[weeklyMeanEntropy.day] ?? {};
aggregated[weeklyMeanEntropy.day] = { ...previousValue, ...weeklyMeanEntropy };
return aggregated;
}, {} as Record<number, any>);
.reduce(
(aggregated, weeklyMeanEntropy) => {
const previousValue = aggregated[weeklyMeanEntropy.day] ?? {};
aggregated[weeklyMeanEntropy.day] = { ...previousValue, ...weeklyMeanEntropy };
return aggregated;
},
{} as Record<number, any>
);

let plotData = Object.values(weeklyDataByTimestamp); //depending on the day, the latest week just started, so the entropy is calculated as 0 because there are no samples

Expand Down
Loading