Skip to content

Commit

Permalink
merge from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
craigrbarnes committed Jan 27, 2025
2 parents d60453b + b78d8c8 commit 36ce172
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packages": ["packages/*"],
"version": "0.10.76"
"version": "0.10.77"
}
10 changes: 5 additions & 5 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 packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gen3/core",
"version": "0.10.76",
"version": "0.10.77",
"author": "CTDS",
"description": "Core module for Gen3.2. Packages provides an interface for interacting with the gen3 API and a redux store for managing state.",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gen3/frontend",
"version": "0.10.76",
"version": "0.10.77",
"description": "Gen3 frontend components, content management, and pages",
"keywords": [],
"author": "Center for Translational Data Science",
Expand Down Expand Up @@ -49,7 +49,7 @@
"os": false
},
"dependencies": {
"@gen3/core": "^0.10.76",
"@gen3/core": "^0.10.77",
"@graphiql/react": "^0.23.1",
"@hello-pangea/dnd": "^17.0.0",
"@iconify/react": "^5.0.2",
Expand Down
7 changes: 4 additions & 3 deletions packages/frontend/src/components/charts/Charts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@ const Charts = ({
</React.Fragment>
);
};

const dataKeys = Object.keys(data[field][0]);
const dataKeys = data[field].length > 0 ? Object.keys(data[field][0]) : [];

const chartTitle = charts[field].title ?? fieldNameToTitle(field);

Expand Down Expand Up @@ -256,7 +255,9 @@ const Charts = ({
};

return (
<Grid className="w-full">{data && Object.keys(charts).map(chartCard)}</Grid>
<Grid className="w-full">
{data && Object.keys(charts)?.map(chartCard)}
</Grid>
);
};

Expand Down
5 changes: 5 additions & 0 deletions packages/frontend/src/components/facets/RangeFacet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,16 @@ const RangeFacet = ({
);
}}
/>
{
// TODO: add updated counts
/*
<div className="bg-gray mt-4 border-1">
{isSuccess && data && Object.values(data).length > 0
? Object.values(data)[0]
: '...'}
</div>
*/
}
</div>
<div
className={showFilters ? 'h-full' : 'h-0 invisible'}
Expand Down
3 changes: 1 addition & 2 deletions packages/sampleCommons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@gen3/samplecommons",
"version": "0.10.76",
"version": "0.10.75",
"version": "0.10.77",
"private": true,
"scripts": {
"lint": "next lint",
Expand Down
2 changes: 1 addition & 1 deletion packages/tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gen3/toolsff",
"version": "0.10.76",
"version": "0.10.77",
"description": "tools for processing Gen3 commons content: color theme, icons",
"main": "index.js",
"type": "module",
Expand Down

0 comments on commit 36ce172

Please sign in to comment.