From 0f0289456c0fa8ac4e01cbc39bf1ddcacaf66124 Mon Sep 17 00:00:00 2001 From: Ima Mervin Date: Wed, 11 Sep 2024 11:35:22 -0600 Subject: [PATCH 1/3] subcomptest --- frontend/components/Viewing/PageJSON/Types/SubComponent3.json | 1 - frontend/package.json | 1 + frontend/public/commitHash.txt | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/components/Viewing/PageJSON/Types/SubComponent3.json b/frontend/components/Viewing/PageJSON/Types/SubComponent3.json index f0d2c413..b778a0e8 100644 --- a/frontend/components/Viewing/PageJSON/Types/SubComponent3.json +++ b/frontend/components/Viewing/PageJSON/Types/SubComponent3.json @@ -41,7 +41,6 @@ "title": "Component", "stripAfter": "#", "predicates": [ - "sbol:Component" ], "link": "$" }, diff --git a/frontend/package.json b/frontend/package.json index eb421832..ffe488ef 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,6 +4,7 @@ "private": true, "scripts": { "dev": "NODE_OPTIONS=--openssl-legacy-provider node customDev.js", + "dev1": "node customDev.js", "build": "next build", "start": "next start -p 3333", "lint": "eslint '*/**/*.{js,jsx}'", diff --git a/frontend/public/commitHash.txt b/frontend/public/commitHash.txt index eeae27fb..97f69a6a 100644 --- a/frontend/public/commitHash.txt +++ b/frontend/public/commitHash.txt @@ -1 +1 @@ -5af31bb4414db276ba10fd44d4d6847dc521bcb8 \ No newline at end of file +5404d880804c953690dad2136246f625b9aaceca \ No newline at end of file From ce0281be03cbae7bdddd3a9116974b436efa77af Mon Sep 17 00:00:00 2001 From: Daniel Fang Date: Wed, 11 Sep 2024 14:01:50 -0600 Subject: [PATCH 2/3] Update package-jar.yml Changed update artifact from v1 to v3 due to deprecation --- .github/workflows/package-jar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-jar.yml b/.github/workflows/package-jar.yml index 95397d5a..a0bc5810 100644 --- a/.github/workflows/package-jar.yml +++ b/.github/workflows/package-jar.yml @@ -40,7 +40,7 @@ jobs: java-version: 17 - run: cd backend && mvn -B package --file pom.xml -DskipTests - run: cd backend && mkdir staging && cp target/*.jar staging - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: Package path: backend/staging From d4cdd4fff1a399d1a55da882799f9c18651d6ec3 Mon Sep 17 00:00:00 2001 From: Bianca Date: Tue, 17 Sep 2024 20:12:16 -0600 Subject: [PATCH 3/3] Updated Interaction3.json and package.json --- frontend/components/Viewing/PageJSON/Types/Interaction3.json | 2 +- frontend/package.json | 1 + frontend/public/commitHash.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/components/Viewing/PageJSON/Types/Interaction3.json b/frontend/components/Viewing/PageJSON/Types/Interaction3.json index 68cf5420..2d358f05 100644 --- a/frontend/components/Viewing/PageJSON/Types/Interaction3.json +++ b/frontend/components/Viewing/PageJSON/Types/Interaction3.json @@ -34,7 +34,7 @@ "tables": [ { "title": "Participations", - "rootPredicate": "sbol:participation", + "rootPredicate": "sbol:hasParticipation", "icon": "faPeopleArrows", "sections": [ { diff --git a/frontend/package.json b/frontend/package.json index eb421832..db8cb2d1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,6 +4,7 @@ "private": true, "scripts": { "dev": "NODE_OPTIONS=--openssl-legacy-provider node customDev.js", + "windowsdev": "node customDev.js", "build": "next build", "start": "next start -p 3333", "lint": "eslint '*/**/*.{js,jsx}'", diff --git a/frontend/public/commitHash.txt b/frontend/public/commitHash.txt index eeae27fb..467ced9c 100644 --- a/frontend/public/commitHash.txt +++ b/frontend/public/commitHash.txt @@ -1 +1 @@ -5af31bb4414db276ba10fd44d4d6847dc521bcb8 \ No newline at end of file +18bc537fa82c0fafdfb178601ba7d61d19c0fe9b \ No newline at end of file