Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
8ec8598
feat: make configurable action buttons shared component
martin-trajanovski Aug 25, 2025
b562e62
more general naming in the component inputs and add new action type xhr
martin-trajanovski Aug 26, 2025
f5093d7
Merge branch 'master' into SWAP-4889-configurable-action-buttons
martin-trajanovski Aug 26, 2025
6f16350
add the configurable buttons in the dataset selection view
martin-trajanovski Aug 26, 2025
3f4de3f
Merge branch 'master' into SWAP-4889-configurable-action-buttons
martin-trajanovski Aug 29, 2025
fdcc888
Resolved conflicts after merging master
nitrosx Sep 10, 2025
ffc3bcb
WIP of the day
nitrosx Sep 11, 2025
b31492a
work of the day
nitrosx Sep 15, 2025
08ce450
Merge branch 'master' of https://github.com/SciCatProject/frontend in…
martin-trajanovski Sep 16, 2025
aace2ef
Merge branch 'SWAP-4889-configurable-action-buttons' of https://githu…
nitrosx Sep 16, 2025
575ecac
first draft of configurable actions
nitrosx Oct 9, 2025
f7b044d
saving work done so far
nitrosx Nov 6, 2025
4816ee8
fixed linting
nitrosx Nov 12, 2025
af2d7fe
merged with master
nitrosx Nov 12, 2025
e6d5f49
solving conflicts and fixing tests
nitrosx Nov 13, 2025
89d790a
fixing tests
nitrosx Nov 13, 2025
66a76eb
added data file for testing configurable actions
nitrosx Nov 13, 2025
1567cc6
resolving merge issues
nitrosx Nov 13, 2025
a7b12cf
fixed all issues with standalone properties
nitrosx Nov 13, 2025
547b4bb
feat: ingestor component for datasets (#2040)
sofyalaski Nov 17, 2025
1b6c5c5
Fixed all the tests for configurable actions
nitrosx Nov 18, 2025
3c396df
fixing linting
nitrosx Nov 18, 2025
53a95fe
completed linting
nitrosx Nov 19, 2025
738210a
solved conflicts and merged master
nitrosx Nov 19, 2025
4b57a5e
Fixed test for actions
nitrosx Nov 19, 2025
c9a6fd3
Added AI generated documentation
nitrosx Nov 19, 2025
edede4b
Added notes about AI generation
nitrosx Nov 19, 2025
752ba77
import missing model and remove incorrect bindings
Junjiequan Nov 19, 2025
97a620a
include fallback for sortedActionsConfig() function
Junjiequan Nov 19, 2025
efcfc5a
minor fix
Junjiequan Nov 19, 2025
0d100af
resolve budget exceeding error
Junjiequan Nov 19, 2025
f1b7ea3
fix unit test
Junjiequan Nov 20, 2025
1077303
restored original actions on datasets list and selection
nitrosx Nov 20, 2025
672fbf6
Fixed CI configurable actions config, fixed errors from configuration
nitrosx Nov 21, 2025
f97d85b
fixed linting
nitrosx Nov 21, 2025
1a989b7
fix published-data e2e flaky selector
Junjiequan Nov 24, 2025
efc38be
refactor: add hover content for metadata name & append human readable…
abdimo101 Nov 24, 2025
892c98d
fix published-data flaky selector
Junjiequan Nov 24, 2025
66d4598
Merge branch 'master' into SWAP-4889-configurable-action-buttons
Junjiequan Nov 24, 2025
fc642ea
enable cypress video
Junjiequan Nov 24, 2025
479cf1c
fix published-data e2e test
Junjiequan Nov 24, 2025
11d2017
fix unit test
Junjiequan Nov 24, 2025
01dd38b
updating datfiles tests
nitrosx Nov 24, 2025
0dfafdf
Merge branch 'SWAP-4889-configurable-action-buttons' of https://githu…
nitrosx Nov 24, 2025
ff63f07
chore(deps-dev): bump the eslint group with 2 updates
dependabot[bot] Nov 24, 2025
bbd8058
chore(deps-dev): bump the eslint group with 2 updates (#2098)
github-actions[bot] Nov 24, 2025
50972d6
chore(deps-dev): bump the types group with 2 updates
dependabot[bot] Nov 24, 2025
1aed7b3
chore(deps-dev): bump the types group with 2 updates (#2099)
github-actions[bot] Nov 24, 2025
9f374ac
chore(deps-dev): bump cypress from 15.6.0 to 15.7.0
dependabot[bot] Nov 24, 2025
c223cc0
chore(deps-dev): bump cypress from 15.6.0 to 15.7.0 (#2100)
github-actions[bot] Nov 24, 2025
305b2be
chore(deps-dev): bump js-yaml from 3.14.1 to 3.14.2
dependabot[bot] Nov 24, 2025
0f91e21
chore(deps-dev): bump js-yaml from 3.14.1 to 3.14.2 (#2104)
github-actions[bot] Nov 24, 2025
7174620
e2e configurable actions tests
nitrosx Nov 24, 2025
9671d7b
fixed linting
nitrosx Nov 25, 2025
5cb061a
improve isLoading
Junjiequan Nov 25, 2025
0e70cf2
update test data
nitrosx Nov 25, 2025
b8635f5
Merge branch 'SWAP-4889-configurable-action-buttons' of https://githu…
nitrosx Nov 25, 2025
69dc806
enable cypress video for debug
Junjiequan Nov 25, 2025
d34050c
flaky test fix last attempt
Junjiequan Nov 25, 2025
4e4efaa
skip flaky test
Junjiequan Nov 25, 2025
255cec5
revert res delay back to 100
Junjiequan Nov 25, 2025
1d59a1b
Merge branch 'master' into SWAP-4889-configurable-action-buttons
Junjiequan Nov 25, 2025
c3d3725
fixed unit test for actions
nitrosx Nov 25, 2025
7a9a7fc
Merge branch 'SWAP-4889-configurable-action-buttons' of https://githu…
nitrosx Nov 25, 2025
bc08c24
fixed linting
nitrosx Nov 25, 2025
acb1010
feat: make configurable action buttons shared component (#1977)
nitrosx Nov 25, 2025
8727002
chore(deps): bump actions/checkout from 5 to 6
dependabot[bot] Nov 25, 2025
b3e9e31
chore(deps): bump actions/checkout from 5 to 6 (#2102)
github-actions[bot] Nov 25, 2025
b09adf1
enclose single action init in try catch
nitrosx Nov 26, 2025
7646003
chore(deps-dev): bump node-forge from 1.3.1 to 1.3.2
dependabot[bot] Nov 26, 2025
b8efa85
chore(deps-dev): bump node-forge from 1.3.1 to 1.3.2 (#2105)
github-actions[bot] Nov 26, 2025
b8feb65
docs: adding the workflow yaml and the default from docs-template (#…
LAShemilt Nov 27, 2025
998d747
refactor: relocate and redesign search bar in dataset and proposal pa…
abdimo101 Dec 1, 2025
bd69434
added more try catch on updated actions status
nitrosx Dec 1, 2025
b74647d
Merge branch 'master' into fix_configurable_components
nitrosx Dec 1, 2025
8ec4342
feat: add collapsible checkbox filters (#2097)
abdimo101 Dec 1, 2025
7cd9997
chore(deps): bump the angular group with 11 updates
dependabot[bot] Dec 1, 2025
b893873
chore(deps): bump the angular group with 11 updates (#2111)
github-actions[bot] Dec 1, 2025
c65a91c
chore(deps): bump @jsonforms/angular-material from 3.6.0 to 3.7.0
dependabot[bot] Dec 2, 2025
88d9566
chore(deps): bump @jsonforms/angular-material from 3.6.0 to 3.7.0 (#2…
github-actions[bot] Dec 2, 2025
43e3165
chore(deps-dev): bump prettier from 3.6.2 to 3.7.3
dependabot[bot] Dec 2, 2025
e6ee2b6
chore(deps-dev): bump prettier from 3.6.2 to 3.7.3 (#2116)
github-actions[bot] Dec 2, 2025
272067f
chore(deps-dev): bump express from 4.21.2 to 4.22.1
dependabot[bot] Dec 2, 2025
0b09293
chore(deps-dev): bump express from 4.21.2 to 4.22.1 (#2117)
github-actions[bot] Dec 2, 2025
161fd10
Merge branch 'master' into fix_configurable_components
nitrosx Dec 2, 2025
b2958ff
fixed linting
nitrosx Dec 2, 2025
8278dae
fix: lint fixes and don't prefer standalone components
bpedersen2 Dec 3, 2025
4e0155b
fix(deps): include ngx-cookie-service in angular group
bpedersen2 Dec 3, 2025
6b9b1c5
chore(deps-dev): bump prettier from 3.7.3 to 3.7.4
dependabot[bot] Dec 3, 2025
7d204fc
enclose single action init in try catch
nitrosx Nov 26, 2025
292da0d
added more try catch on updated actions status
nitrosx Dec 1, 2025
fa5271e
fixed linting
nitrosx Dec 2, 2025
6f70733
chore(deps-dev): bump prettier from 3.7.3 to 3.7.4 (#2125)
github-actions[bot] Dec 3, 2025
fd9ad8a
chore(deps-dev): bump jasmine from 5.12.0 to 5.13.0
dependabot[bot] Dec 3, 2025
691cabc
chore(deps-dev): bump jasmine from 5.12.0 to 5.13.0 (#2126)
github-actions[bot] Dec 3, 2025
0967b10
chore(deps-dev): bump cypress from 15.7.0 to 15.7.1
dependabot[bot] Dec 3, 2025
28b4bf5
chore(deps-dev): bump cypress from 15.7.0 to 15.7.1 (#2128)
github-actions[bot] Dec 3, 2025
f0bd838
chore(deps-dev): bump the eslint group with 2 updates
dependabot[bot] Dec 3, 2025
4c81ec3
fix: on reset remove unnecessary fileList array
minottic Dec 3, 2025
82d1acd
Merge branch 'master' into reset_all_fix
minottic Dec 3, 2025
bab2eeb
Remove redundant files initialization in admin-tab
minottic Dec 3, 2025
ff9f702
chore(deps-dev): bump the eslint group with 2 updates (#2124)
github-actions[bot] Dec 3, 2025
ff6d7db
updated linting
nitrosx Dec 3, 2025
820240e
Merge branch 'fix_configurable_components' of https://github.com/SciC…
nitrosx Dec 3, 2025
5654fc1
bug fix
Junjiequan Dec 3, 2025
91a856b
refactor: make filter buttons consistent across datasets and proposal…
abdimo101 Dec 3, 2025
b278241
fix: resolve page navigation in datasets page (#2132)
abdimo101 Dec 3, 2025
7409da5
fix unit
Junjiequan Dec 3, 2025
98b6314
Merge branch 'master' into fix_configurable_components
nitrosx Dec 3, 2025
1336f12
fix: fix configurable components (#2109)
nitrosx Dec 3, 2025
9e5c95e
Merge branch 'master' into reset_all_fix
nitrosx Dec 3, 2025
ee7e108
refactor(proposal): minor UI improvement (#2131)
Junjiequan Dec 3, 2025
3601a1b
Merge branch 'master' into reset_all_fix
minottic Dec 3, 2025
7f0fa53
chore(deps): Remove coveralls
bpedersen2 Dec 3, 2025
9915d51
fix(deps): bump ngx-layout to 19.x
bpedersen2 Dec 3, 2025
131605f
generated new docs version for configurable actions
nitrosx Dec 4, 2025
36d0b61
fix(deps): bump ngx-layout to 19.x (#2122)
nitrosx Dec 4, 2025
5f04842
Merge branch 'master' into drop-coveralls
nitrosx Dec 4, 2025
1a34977
fix:only show Edit tab if editMetadataEnabled is true
emigun Dec 4, 2025
6b0cb47
Merge branch 'master' into reset_all_fix
minottic Dec 4, 2025
67d2c69
chore(deps): remove coveralls (#2123)
nitrosx Dec 4, 2025
cdc23d8
Update docs/contributors/configurable_actions_technical.md
nitrosx Dec 4, 2025
cac5d4d
Update docs/contributors/configurable_actions_technical.md
nitrosx Dec 4, 2025
ef5e032
Update docs/contributors/configurable_actions_technical.md
nitrosx Dec 4, 2025
d944731
Update docs/contributors/configurable_actions_technical.md
nitrosx Dec 4, 2025
df433e5
Update docs/contributors/configurable_actions_technical.md
nitrosx Dec 4, 2025
173b493
Update docs/user/configurable_actions_user.md
nitrosx Dec 4, 2025
6ac7550
Merge branch 'master' into configurable-actions-docs
nitrosx Dec 4, 2025
e832f9e
Merge branch 'master' into fix-editMetadataEnabled
nitrosx Dec 4, 2025
3275a95
fix(ui): enable configurable borders for side panel and table (#2137)
Junjiequan Dec 4, 2025
cab3261
Template Authorization header from configurable actions
Dec 1, 2025
78be474
handle undefined actionConfig.headers
belfhi Dec 1, 2025
6d35421
add functionality to add current dataset to shopping cart from datase…
FloKo2669 Dec 4, 2025
7a6f432
addressing sourcery bot feedback
FloKo2669 Dec 4, 2025
583111a
change Button label and icon
FloKo2669 Dec 5, 2025
f65586b
Merge branch 'master' into reset_all_fix
minottic Dec 5, 2025
9da6353
feat: add "add to Cart" Button to dataset detail view (#2135)
nitrosx Dec 5, 2025
edf5179
Merge branch 'master' into fix-authorization-header-configurable-actions
nitrosx Dec 5, 2025
42a70e2
Merge branch 'master' into reset_all_fix
nitrosx Dec 5, 2025
87944ce
fix: template Authorization header from configurable actions (#2108)
nitrosx Dec 5, 2025
a0ddee8
Merge branch 'master' into reset_all_fix
nitrosx Dec 5, 2025
18c157f
fix: minor css fix (#2140)
Junjiequan Dec 5, 2025
ebeaae4
Merge branch 'master' into reset_all_fix
nitrosx Dec 5, 2025
a209a82
fix: on reset remove unnecessary fileList array (#2130)
nitrosx Dec 5, 2025
5fa545c
Merge branch 'master' into fix-editMetadataEnabled
nitrosx Dec 5, 2025
04f8009
fix: flaky unit test fix (#2142)
Junjiequan Dec 5, 2025
b5a2dde
Merge branch 'master' into configurable-actions-docs
bpedersen2 Dec 5, 2025
dc54477
docs(theme): add first draft doc for theme (#2141)
Junjiequan Dec 5, 2025
6f6b1c8
fix: rely on default BE code
minottic Dec 5, 2025
82b13e3
addressed comments
nitrosx Dec 5, 2025
cd81225
Merge branch 'configurable-actions-docs' of https://github.com/SciCat…
nitrosx Dec 5, 2025
acb5b2f
Merge branch 'master' into configurable-actions-docs
nitrosx Dec 8, 2025
68d764a
fix: generated new docs version for configurable actions (#2134)
nitrosx Dec 8, 2025
77e9ebe
Merge branch 'master' into fix-editMetadataEnabled
nitrosx Dec 8, 2025
23393f0
fix: only show Edit tab if editMetadataEnabled is true (#2136)
nitrosx Dec 8, 2025
2facefb
Merge branch 'master' into reset_default_code
nitrosx Dec 8, 2025
9903a68
fix: rely on default BE code (#2144)
nitrosx Dec 8, 2025
c129678
chore(deps-dev): bump the eslint group with 2 updates
dependabot[bot] Dec 8, 2025
7637c0e
chore(deps-dev): bump the eslint group with 2 updates (#2146)
github-actions[bot] Dec 8, 2025
dae9dbd
docs: build docs index dynamically
minottic Dec 9, 2025
eee59b7
docs: use file path after copy (#2148)
minottic Dec 9, 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: 6 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"root": true,
"ignorePatterns": ["projects/**/*"],
"ignorePatterns": [
"projects/**/*",
"src/app/shared/sdk/models/ingestor/**"], // Ignore autogenerated files
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module",
Expand Down Expand Up @@ -83,7 +85,9 @@
"@angular-eslint/prefer-standalone": "warn",
"@ngrx/on-function-explicit-return-type": "warn",
"@ngrx/no-store-subscription": "warn",
"@angular-eslint/no-output-native": "warn"
"@angular-eslint/no-output-native": "warn",
"@angular-eslint/prefer-standalone": "off"

}
}
]
Expand Down
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ updates:
angular:
patterns:
- "@angular*"
- "ngx-cookie-service"
update-types:
- "minor"
- "patch"
Expand Down
5 changes: 5 additions & 0 deletions .github/mkdocs/mkdocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
INHERIT: mkdocs-default.yml
# nav:
# - index.md
# - Example.md
# - About: about/index.md
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Checkout repository
uses: actions/checkout@v5
uses: actions/checkout@v6

## NOTE: This step is only required if the repository has been configured to Require approval
## Checks if update-type is patch or minor, then approve if the PR status is not approved yet.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Deploy docs

on: # yamllint disable-line rule:truthy
push:
branches:
- master
tags:
- v*
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: SciCatProject/docs-template/.github/actions/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
push: ${{ github.event_name == 'push' && 'true' || '' }}
# if this file does not need to exist locally, the one in the action is used
# https://github.com/SciCatProject/docs-template/blob/v0.1.0/.github/actions/mkdocs-pages/mkdocs-nested.yml
docs_config: .github/mkdocs/mkdocs-nested.yml
2 changes: 1 addition & 1 deletion .github/workflows/release-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
packages: write

steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Set up Node.js
uses: actions/setup-node@v6
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Set up Node.js
uses: actions/setup-node@v6
Expand All @@ -39,7 +39,7 @@ jobs:

steps:
- name: Check out Git repository
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Set up Node.js
uses: actions/setup-node@v6
Expand All @@ -62,7 +62,7 @@ jobs:
needs: [install-and-cache]
steps:
- name: Check out
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Set up Node.js
uses: actions/setup-node@v6
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Set up Node.js
uses: actions/setup-node@v6
Expand Down Expand Up @@ -131,6 +131,7 @@ jobs:
config-file: cypress.config.ts
browser: chrome
install-command: npm install --omit peer

- name: docker logs
if: ${{ failure() }}
run: |
Expand Down
8 changes: 5 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
"version": "0.2.0",
"configurations": [
{
"name": "ng serve",
"name": "Debug SciCat frontend in Chrome",
"type": "chrome",
"request": "launch",
"url": "http://localhost:4200/#",
"webRoot": "${workspaceFolder}"
"url": "http://localhost:4200",
"webRoot": "${workspaceFolder}",
"sourceMaps": true,
"trace": true
},
{
"name": "ng test",
Expand Down
4 changes: 4 additions & 0 deletions CI/e2e/.env.backend.e2e
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@ ES_MAX_RESULT=210000
ES_FIELDS_LIMIT=400000
ES_INDEX="dataset"
ES_REFRESH="wait_for"

FRONTEND_CONFIG_FILE="./dist/config/frontend.config.json"
FRONTEND_THEME_FILE="./dist/config/frontend.theme.json"

1 change: 1 addition & 0 deletions CI/e2e/docker-compose.e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ services:
- "./CI/e2e/functionalAccounts.e2e.json:/home/node/app/functionalAccounts.json"
- "./CI/e2e/proposalTypes.e2e.json:/home/node/app/proposalTypes.json"
- "./CI/e2e/frontend.config.e2e.json:/home/node/app/dist/config/frontend.config.json"
- "./CI/e2e/frontend.theme.e2e.json:/home/node/app/dist/config/frontend.theme.json"
- "./CI/e2e/publishedDataConfig.e2e.json:/home/node/app/publishedDataConfig.json"
environment:
- DOI_USERNAME=${DOI_USERNAME}
Expand Down
Loading