Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
09197b0
Bump nanoid in the npm_and_yarn group across 1 directory
dependabot[bot] Jan 15, 2025
757268e
Fix typo
jthrilly Jan 15, 2025
16e1032
Merge pull request #267 from complexdatacollective/jthrilly-patch-1
jthrilly Jan 15, 2025
04128bf
Merge pull request #266 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 15, 2025
e809fce
Bump motion from 11.17.1 to 12.0.0
dependabot[bot] Jan 20, 2025
a322f91
Bump eslint-config-next from 15.1.4 to 15.1.5
dependabot[bot] Jan 20, 2025
d715ba9
Merge pull request #275 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 20, 2025
da33904
Merge pull request #272 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 20, 2025
7d6e83f
Bump @types/uuid from 9.0.8 to 10.0.0
dependabot[bot] Jan 27, 2025
905dd10
Bump @radix-ui/react-dialog from 1.1.4 to 1.1.5
dependabot[bot] Jan 27, 2025
b8d4b54
Bump @typescript-eslint/parser from 8.20.0 to 8.21.0
dependabot[bot] Jan 27, 2025
1d054d9
Bump @radix-ui/react-alert-dialog from 1.1.4 to 1.1.5
dependabot[bot] Jan 27, 2025
e02de40
Bump @radix-ui/react-select from 2.1.4 to 2.1.5
dependabot[bot] Jan 27, 2025
96776f7
Merge pull request #278 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 28, 2025
2ab2dfc
Merge pull request #282 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 28, 2025
4944afe
Merge pull request #281 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 28, 2025
854be21
Merge pull request #280 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 28, 2025
85a3cc6
Merge pull request #279 from complexdatacollective/dependabot/npm_and…
jthrilly Jan 28, 2025
00ae93a
fix package lock
jthrilly Feb 4, 2025
1f12cfa
use latest corepack for gh build
buckhalt Feb 3, 2025
32bd5a8
linting
jthrilly Feb 4, 2025
5ce4a2d
fix graphml export by downgrading @xmldom/xmldom
jthrilly Feb 5, 2025
b671980
Merge pull request #286 from complexdatacollective/graphml-export-fix
jthrilly Feb 5, 2025
2f44d6a
bump vitest
jthrilly Feb 5, 2025
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
8 changes: 8 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Use Latest Corepack
run: |
echo "Before: corepack version => $(corepack --version || echo 'not installed')"
npm install -g corepack@latest
echo "After : corepack version => $(corepack --version)"
corepack enable
pnpm --version

- name: Enable Corepack
run: corepack enable

Expand Down
2 changes: 1 addition & 1 deletion actions/activityFeed.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'use sever';
'use server';

import { safeRevalidateTag } from '~/lib/cache';
import type { Activity, ActivityType } from '~/lib/data-table/types';
Expand Down
2 changes: 2 additions & 0 deletions actions/participants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ export async function importParticipants(rawInput: unknown) {
*/
const participantsWithIdentifiers = participantList.map((participant) => {
return {
// Cannot use nullish coalescing here because of https://github.com/complexdatacollective/Fresco/pull/140/commits/06260b815558030b0605e14e5baf5a6ce238b1ab
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
identifier: !participant.identifier ? createId() : participant.identifier,
label: participant.label === '' ? undefined : participant.label,
};
Expand Down
6 changes: 3 additions & 3 deletions components/DataTable/DataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function DataTable<TData, TValue>({
if (actions) {
const actionsColumn = {
id: 'actions',
header: () => (actionsHeader ? actionsHeader : null),
header: () => actionsHeader ?? null,
cell: ({ row }: { row: Row<TData> }) => {
const cellDeleteHandler = async (item: TData) => {
await handleDeleteSelected?.([item]);
Expand Down Expand Up @@ -148,7 +148,7 @@ export function DataTable<TData, TValue>({
return (
<>
{(filterColumnAccessorKey || headerItems) && (
<div className="flex items-center gap-2 pb-4 pt-1">
<div className="flex items-center gap-2 pt-1 pb-4">
{filterColumnAccessorKey && (
<Input
name="filter"
Expand Down Expand Up @@ -222,7 +222,7 @@ export function DataTable<TData, TValue>({
</div>
<div>
<div className="flex justify-between py-4">
<div className="text-sm text-muted-foreground">
<div className="text-muted-foreground text-sm">
{table.getFilteredSelectedRowModel().rows.length} of{' '}
{table.getFilteredRowModel().rows.length} row(s) selected.
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-env jest */

import { ncUUIDProperty } from '@codaco/shared-consts';
import { DOMParser, MIME_TYPE } from '@xmldom/xmldom';
import { DOMParser } from '@xmldom/xmldom';
import { beforeEach, describe, expect, it } from 'vitest';
import {
mockCodebook,
Expand All @@ -23,7 +23,7 @@ const buildXML = (...args) => {
}

const parser = new DOMParser();
const result = parser.parseFromString(xmlString, MIME_TYPE.XML_APPLICATION);
const result = parser.parseFromString(xmlString, 'text/xml');
return result;
};

Expand Down
4 changes: 2 additions & 2 deletions lib/network-exporters/formatters/graphml/createGraphML.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
sessionProperty,
sessionStartTimeProperty,
} from '@codaco/shared-consts';
import dom, { MIME_TYPE } from '@xmldom/xmldom';
import dom from '@xmldom/xmldom';
import {
getAttributePropertyFromCodebook,
getEntityAttributes,
Expand Down Expand Up @@ -110,7 +110,7 @@ const setUpXml = (exportOptions, sessionVariables) => {
)}${xmlFooter}`;
return new globalContext.DOMParser().parseFromString(
graphMLOutline,
MIME_TYPE.XML_APPLICATION,
'text/xml',
);
};

Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fresco",
"version": "2.1.0",
"version": "2.1.1",
"private": true,
"type": "module",
"packageManager": "pnpm@9.1.1+sha256.9551e803dcb7a1839fdf5416153a844060c7bce013218ce823410532504ac10b",
Expand Down Expand Up @@ -29,15 +29,15 @@
"@hookform/resolvers": "^3.10.0",
"@lucia-auth/adapter-prisma": "^3.0.2",
"@paralleldrive/cuid2": "^2.2.2",
"@radix-ui/react-alert-dialog": "^1.1.4",
"@radix-ui/react-alert-dialog": "^1.1.5",
"@radix-ui/react-checkbox": "^1.1.3",
"@radix-ui/react-collapsible": "^1.1.2",
"@radix-ui/react-dialog": "^1.1.4",
"@radix-ui/react-dialog": "^1.1.5",
"@radix-ui/react-dropdown-menu": "^2.1.4",
"@radix-ui/react-label": "^2.1.1",
"@radix-ui/react-popover": "^1.1.4",
"@radix-ui/react-progress": "^1.1.1",
"@radix-ui/react-select": "^2.1.4",
"@radix-ui/react-select": "^2.1.5",
"@radix-ui/react-separator": "^1.1.1",
"@radix-ui/react-slot": "^1.1.1",
"@radix-ui/react-switch": "^1.1.2",
Expand All @@ -47,7 +47,7 @@
"@reduxjs/toolkit": "^1.9.7",
"@tanstack/react-table": "^8.20.6",
"@uploadthing/react": "^7.1.5",
"@xmldom/xmldom": "^0.9.6",
"@xmldom/xmldom": "^0.8.10",
"animejs": "^2.2.0",
"archiver": "^7.0.1",
"async": "^3.2.6",
Expand All @@ -67,7 +67,7 @@
"lucia": "^2.7.7",
"lucide-react": "^0.471.1",
"luxon": "^3.5.0",
"motion": "^11.13.1",
"motion": "^12.0.0",
"next": "^14.2.23",
"nuqs": "^1.19.1",
"ohash": "^1.1.4",
Expand Down Expand Up @@ -124,13 +124,13 @@
"@types/react": "^18.3.7",
"@types/react-dom": "^18.3.1",
"@types/redux-form": "^8.3.11",
"@types/uuid": "^9.0.8",
"@types/uuid": "^10.0.0",
"@types/validator": "^13.12.2",
"@typescript-eslint/eslint-plugin": "^8.20.0",
"@typescript-eslint/parser": "^8.20.0",
"@typescript-eslint/parser": "^8.21.0",
"@vitejs/plugin-react": "^4.3.4",
"eslint": "^8.57.1",
"eslint-config-next": "^15.1.4",
"eslint-config-next": "^15.1.5",
"eslint-config-prettier": "^10.0.1",
"jest": "^29.7.0",
"jsdom": "^26.0.0",
Expand All @@ -143,6 +143,6 @@
"tailwindcss-animate": "^1.0.7",
"typescript": "5.7.3",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^2.1.8"
"vitest": "^2.1.9"
}
}
Loading