Skip to content

Commit de47f06

Browse files
authored
Release 04-04-2025 (#1810)
## Description Short description of the pull request ## Motivation Background on use case, changes needed ## Fixes: Please provide a list of the fixes implemented in this PR * Items added ## Changes: Please provide a list of the changes implemented by this PR * changes made ## Tests included - [ ] Included for each change/fix? - [ ] Passing? (Merge will not be approved unless this is checked) ## Documentation - [ ] swagger documentation updated \[required\] - [ ] official documentation updated \[nice-to-have\] ### official documentation info If you have updated the official documentation, please provide PR # and URL of the pages where the updates are included ## Backend version - [ ] Does it require a specific version of the backend - which version of the backend is required: ## Summary by Sourcery Implement comprehensive improvements to the SciCat frontend, focusing on dynamic material table, metadata handling, and user experience enhancements across multiple components New Features: - Added support for new metadata types like date, link, number_range, and quantity_range - Implemented dynamic table settings with column customization and saving - Enhanced internal linking capabilities in dataset details - Added more robust ownership and access control checks Bug Fixes: - Fixed issues with metadata type handling - Corrected access control and ownership checks - Resolved pagination and sorting inconsistencies across different views Enhancements: - Refactored table components to use a more flexible dynamic material table - Improved metadata editing and viewing with more validation and formatting - Enhanced proposal, dataset, and job detail views with better layout and information display - Implemented more granular table sorting and pagination Tests: - Added comprehensive Cypress tests for new table functionality - Expanded test coverage for metadata editing and viewing - Implemented tests for dynamic table settings and interactions
2 parents b08f3d6 + c5d2411 commit de47f06

File tree

101 files changed

+3247
-1183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3247
-1183
lines changed

.github/workflows/release-push.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121

22+
- name: Set up Node.js
23+
uses: actions/setup-node@v4
24+
with:
25+
node-version: ${{ env.NODE_VERSION }}
26+
2227
## Commit message examples for Release type (patch|minor|major) can be found:
2328
## https://github.com/mathieudutour/github-tag-action
2429
- name: Bump version and push tag
@@ -28,6 +33,24 @@ jobs:
2833
github_token: ${{ secrets.GITHUB_TOKEN }}
2934
release_branches: ${{ env.RELEASE_BRANCH }}
3035

36+
- name: Strip 'v' from the tag
37+
id: release_version
38+
run: |
39+
TAG=${{ steps.tag_version.outputs.new_tag }}
40+
WITHOUT_V=${TAG#v}
41+
echo "release_version=$WITHOUT_V" >> $GITHUB_OUTPUT
42+
43+
- name: Update release version
44+
run: |
45+
npm version --no-git-tag-version ${{ steps.release_version.output.release_version }}
46+
47+
- name: Commit package with new version
48+
run: |
49+
git config --global user.name 'SciCat FE Release Workflow'
50+
git config --global user.email 'scicat.release.workflow@users.noreply.github.com'
51+
git commit -am --amend "Set release"
52+
git push
53+
3154
- name: Create a GitHub release
3255
uses: ncipollo/release-action@v1
3356
with:
@@ -50,11 +73,6 @@ jobs:
5073
username: ${{ github.actor }}
5174
password: ${{ secrets.GITHUB_TOKEN }}
5275

53-
- name: Set up Node.js
54-
uses: actions/setup-node@v4
55-
with:
56-
node-version: ${{ env.NODE_VERSION }}
57-
5876
- name: Install Node.js dependencies
5977
run: npm ci
6078

File renamed without changes.

CI/e2e/frontend.config.e2e.json

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,34 @@
208208
{ "TextFilter": true }
209209
],
210210
"conditions": []
211-
}
211+
},
212+
213+
"labelsLocalization": {
214+
"datasetDefault": {},
215+
"datasetCustom": {
216+
"pid": "PID",
217+
"description": "Description",
218+
"principalInvestigator": "Principal Investigator",
219+
"keywords": "Keywords",
220+
"creationTime": "Creation Time",
221+
"scientificMetadata": "Scientific Metadata",
222+
"metadataJsonView": "Metadata JsonView",
223+
"datasetName": "Dataset Name"
224+
},
225+
"proposalDefault": {
226+
"General Information": "Proposal Information",
227+
"Title": "Proposal Title",
228+
"Abstract": "Abstract",
229+
"Proposal Id": "Proposal Id",
230+
"Proposal Type": "Proposal Type",
231+
"Parent Proposal": "Parent Proposal",
232+
"Start Time": "Start Time",
233+
"End Time": "End Time",
234+
"Creator Information": "People",
235+
"Main Proposer": "Proposal Submitted By",
236+
"Principal Investigator": "Principal Investigator",
237+
"Metadata": "Additional Information"
238+
}
239+
},
240+
"dateFormat": "yyyy-MM-dd HH:mm"
212241
}

cypress/e2e/datasets/datasets-attachment.cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe("Dataset attachments", () => {
7979

8080
cy.get(".mat-mdc-tab-link").contains("Details").click();
8181

82-
cy.get('[data-cy="attachment-thumbnail"]').click();
82+
cy.get('[data-cy="attachment-thumbnail"]').first().click();
8383

8484
cy.get("@open").should("be.calledWith", Cypress.sinon.match(/blob:.*/));
8585
});

cypress/e2e/datasets/datasets-datafiles.cy.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { testData } from "../../fixtures/testData";
2+
13
describe("Dataset datafiles", () => {
24
beforeEach(() => {
35
cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
@@ -23,7 +25,12 @@ describe("Dataset datafiles", () => {
2325
notebookAll: "http://localhost:4200/notebook/all",
2426
};
2527
it("Should be able to download/notebook with selected/all", () => {
26-
cy.createDataset("raw", undefined, "small");
28+
cy.createDataset(
29+
"raw",
30+
testData.rawDataset.datasetName,
31+
undefined,
32+
"small",
33+
);
2734

2835
cy.visit("/datasets");
2936

@@ -75,7 +82,12 @@ describe("Dataset datafiles", () => {
7582
});
7683

7784
it("Should not be able to download selected/all file that is exceeding size limit", () => {
78-
cy.createDataset("raw", undefined, "large");
85+
cy.createDataset(
86+
"raw",
87+
testData.rawDataset.datasetName,
88+
undefined,
89+
"large",
90+
);
7991

8092
cy.visit("/datasets");
8193

cypress/e2e/datasets/datasets-general.cy.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ describe("Datasets general", () => {
3838

3939
cy.finishedLoading();
4040

41+
cy.get("login-form").should("exist");
42+
4143
cy.reload();
4244
// Without reloading, the user will land on last visited page before logout
4345
// i.e. the dataset detail page, because the login page "remembers" the previousRoute.
@@ -65,7 +67,7 @@ describe("Datasets general", () => {
6567
it("should be able to see and click proposal connection link from dataset details page", () => {
6668
const proposalId = Math.floor(100000 + Math.random() * 900000).toString();
6769
cy.createProposal({ ...testData.proposal, proposalId });
68-
cy.createDataset("raw", proposalId);
70+
cy.createDataset("raw", undefined, proposalId);
6971

7072
cy.visit("/datasets");
7173

0 commit comments

Comments
 (0)