Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
29b9c29
fix some related datasets loading issues
martin-trajanovski Jan 13, 2025
30bb34c
Merge branch 'master' into SWAP-4357-related-proposals-and-improvements
martin-trajanovski Jan 14, 2025
f0c36c3
add the related proposals components
martin-trajanovski Jan 14, 2025
e1bf4e6
related proposals first working version
martin-trajanovski Jan 15, 2025
11adc78
related proposals final improvements
martin-trajanovski Jan 16, 2025
75d41a0
add e2e tests for related proposals
martin-trajanovski Jan 16, 2025
5806c40
fix some test linting issues
martin-trajanovski Jan 16, 2025
b4a0fa0
resolve merge conflicts
martin-trajanovski Jan 24, 2025
5115610
fix the imports
martin-trajanovski Jan 24, 2025
80b7ec0
fix tests and found issues
martin-trajanovski Jan 24, 2025
d193265
minor review changes
martin-trajanovski Jan 24, 2025
db48906
Merge branch 'master' into SWAP-4357-related-proposals-and-improvements
martin-trajanovski Jan 28, 2025
2dea96e
initial dynamic-material-table and demo
martin-trajanovski Jan 28, 2025
08066bb
Merge branch 'master' into SWAP-4357-related-proposals-and-improvements
martin-trajanovski Jan 28, 2025
9561548
remove some leftovers in the styling
martin-trajanovski Jan 28, 2025
8548f73
pull related proposal changes
martin-trajanovski Jan 28, 2025
37cdc2f
try to use the new table only and make it work with the pagination
martin-trajanovski Jan 28, 2025
c20fbda
try to finalize the first stable version of the dynamic mat table
martin-trajanovski Jan 29, 2025
d4e221c
cleanup and improvements in the usage of the new table for proposals
martin-trajanovski Jan 30, 2025
16e63d0
add some more table improvements
martin-trajanovski Jan 31, 2025
2df51bf
Merge branch 'master' into add-dynamic-material-table
martin-trajanovski Jan 31, 2025
7c53ca7
try to fix tests and build
martin-trajanovski Jan 31, 2025
4769a4c
Merge branch 'add-dynamic-material-table' of https://github.com/SciCa…
martin-trajanovski Jan 31, 2025
731d1dd
Merge branch 'master' into add-dynamic-material-table
martin-trajanovski Jan 31, 2025
63627de
Added proposal columns
nitrosx Jan 31, 2025
ff0e699
fix search positioning and some more cleanup
martin-trajanovski Feb 1, 2025
2f0803c
add debounce on the table search and try to fix e2e tests
martin-trajanovski Feb 1, 2025
6aa2096
resolve conflicts
martin-trajanovski Feb 3, 2025
4153046
some more improvements and cleanup
martin-trajanovski Feb 3, 2025
0d95e45
Merge branch 'master' into add-dynamic-material-table
martin-trajanovski Feb 4, 2025
0552561
prevent multi row cell text and add ellipsis effect for long text
martin-trajanovski Feb 4, 2025
8b97654
some syling improvements and remove timeout from reorder to improve p…
martin-trajanovski Feb 4, 2025
076499b
progress bar and column filter fixes and cleanup of timeouts
martin-trajanovski Feb 4, 2025
a49c8d1
Merge branch 'master' into add-dynamic-material-table
martin-trajanovski Feb 5, 2025
3a93994
feat: saving table settings in local storage initially
martin-trajanovski Feb 5, 2025
e5f635e
fix the table settings reset and save
martin-trajanovski Feb 6, 2025
6c1cb71
refactor the table settings default and loaded config
martin-trajanovski Feb 6, 2025
73a6af6
finalize saving proposal table settings inside the user external sett…
martin-trajanovski Feb 6, 2025
2038cda
fix found issues if externalSettings is not present
martin-trajanovski Feb 7, 2025
7a36dd4
unused proposal actions cleanup
martin-trajanovski Feb 7, 2025
325604d
Merge branch 'add-dynamic-material-table' of https://github.com/SciCa…
martin-trajanovski Feb 7, 2025
0e11193
fix reorder column bug if some column in the middle is not displayed
martin-trajanovski Feb 7, 2025
bc98e8c
server-side column sort
martin-trajanovski Feb 8, 2025
2c32d74
Merge branch 'master' into add-dynamic-material-table
martin-trajanovski Feb 9, 2025
9b9d646
Merge branch 'master' into SWAP-4501-save-table-settings-in-user-exte…
martin-trajanovski Feb 9, 2025
edfd877
use the new dynamic-mat-table in proposal datasets
martin-trajanovski Feb 10, 2025
47a5301
use the dynamic-mat-table in the related proposals
martin-trajanovski Feb 10, 2025
9131f3c
fix table sort and do some action cleanup
martin-trajanovski Feb 10, 2025
4ce9c20
fix the failing unit tests
martin-trajanovski Feb 10, 2025
1695f4e
some review fixes and e2e tests
martin-trajanovski Feb 11, 2025
9e875b3
scientific metadata improvements
martin-trajanovski Feb 13, 2025
e6029eb
Merge branch 'master' into add-dynamic-material-table
martin-trajanovski Feb 20, 2025
3bfa807
Merge branch 'master' into SWAP-4501-save-table-settings-in-user-exte…
martin-trajanovski Feb 20, 2025
34140b1
improvements in the dynamic table custom rendering and metadata
martin-trajanovski Feb 20, 2025
8cd4249
resolve merge conflictgs
martin-trajanovski Feb 20, 2025
48f7a22
cleanup some comments
martin-trajanovski Feb 20, 2025
8721e10
Merge branch 'add-dynamic-material-table' of https://github.com/SciCa…
martin-trajanovski Feb 20, 2025
5af8d47
merge latest changes from add-dynamic-material-table
martin-trajanovski Feb 20, 2025
ac2f26a
metadata view final improvements
martin-trajanovski Feb 21, 2025
d249040
scientific metadata edit improvements
martin-trajanovski Feb 21, 2025
d754cf5
resolve merge conflicts
martin-trajanovski Feb 21, 2025
3804a3e
Merge branch 'SWAP-4501-save-table-settings-in-user-external-settings…
martin-trajanovski Feb 23, 2025
4a26071
date field edit improvements in metadata
martin-trajanovski Feb 23, 2025
15d6744
use linky pipe and add link validation in metadata
martin-trajanovski Feb 24, 2025
167f265
Merge branch 'master' into SWAP-4456-dataset-metadata-improvements
martin-trajanovski Feb 25, 2025
45104db
test fixes and scientifc metadata unit improvements
martin-trajanovski Feb 25, 2025
f21f6d1
Merge branch 'SWAP-4456-dataset-metadata-improvements' of https://git…
martin-trajanovski Feb 25, 2025
b555e90
fix unit tests
martin-trajanovski Feb 25, 2025
27cac07
test: e2e tests for proposals new dynamic material table
martin-trajanovski Feb 26, 2025
aba1d99
add some more tests for dynamic material table settings
martin-trajanovski Feb 27, 2025
c779f1b
Merge branch 'master' into SWAP-4539-e2e-tests-for-the-new-proposals-…
martin-trajanovski Mar 3, 2025
02eaa4b
quickfix for the failing test
martin-trajanovski Mar 3, 2025
4134fd6
fix the problematic test
martin-trajanovski Mar 3, 2025
965600d
feat: add number_range and quantity_range in scientific metadata
martin-trajanovski Mar 3, 2025
7e060f0
Merge branch 'master' of https://github.com/SciCatProject/frontend in…
martin-trajanovski Mar 4, 2025
dff0dab
use real numbers instead of strings in the range types
martin-trajanovski Mar 4, 2025
b5a8185
test: add e2e tests for the new types in the metadata and improvements
martin-trajanovski Mar 5, 2025
ebef9eb
fix some of the failing tests
martin-trajanovski Mar 5, 2025
35223b4
resolve merge conflicts
martin-trajanovski Mar 24, 2025
de9e858
add the missing dateFormat config for the e2e tests
martin-trajanovski Mar 24, 2025
058cbbd
Merge branch 'master' into SWAP-4565-add-metadata-improvements-e2e
martin-trajanovski Mar 24, 2025
16becc1
Merge branch 'master' into SWAP-4565-add-metadata-improvements-e2e
martin-trajanovski Mar 25, 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
3 changes: 2 additions & 1 deletion CI/e2e/frontend.config.e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,6 @@
{ "TextFilter": true }
],
"conditions": []
}
},
"dateFormat": "yyyy-MM-dd HH:mm"
}
16 changes: 14 additions & 2 deletions cypress/e2e/datasets/datasets-datafiles.cy.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { testData } from "../../fixtures/testData";

describe("Dataset datafiles", () => {
beforeEach(() => {
cy.readFile("CI/e2e/frontend.config.e2e.json").then((baseConfig) => {
Expand All @@ -23,7 +25,12 @@ describe("Dataset datafiles", () => {
notebookAll: "http://localhost:4200/notebook/all",
};
it("Should be able to download/notebook with selected/all", () => {
cy.createDataset("raw", undefined, "small");
cy.createDataset(
"raw",
testData.rawDataset.datasetName,
undefined,
"small",
);

cy.visit("/datasets");

Expand Down Expand Up @@ -75,7 +82,12 @@ describe("Dataset datafiles", () => {
});

it("Should not be able to download selected/all file that is exceeding size limit", () => {
cy.createDataset("raw", undefined, "large");
cy.createDataset(
"raw",
testData.rawDataset.datasetName,
undefined,
"large",
);

cy.visit("/datasets");

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/datasets/datasets-general.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe("Datasets general", () => {
it("should be able to see and click proposal connection link from dataset details page", () => {
const proposalId = Math.floor(100000 + Math.random() * 900000).toString();
cy.createProposal({ ...testData.proposal, proposalId });
cy.createDataset("raw", proposalId);
cy.createDataset("raw", undefined, proposalId);

cy.visit("/datasets");

Expand Down
Loading