www/kiste.abcd-j.de-ui
10
0
Fork 0
Code Issues Pull requests 1 Packages Activity

Bulk UI updates #4

Open
adina wants to merge 0 commits from updates into main
pull from: updates
merge into: www:main
Conversation 1 Commits - Files changed -
adina commented 2026-02-12 08:44:36 +00:00
Member
Copy link

This takes the changes in https://hub.psychoinformatics.de/www/pool.psychoinformatics.de-ui of the past two weeks in bulk. @jsheunis I would be greatful if you could give this a quick skim

This takes the changes in https://hub.psychoinformatics.de/www/pool.psychoinformatics.de-ui of the past two weeks in bulk. @jsheunis I would be greatful if you could give this a quick skim
jsheunis requested changes 2026-02-12 12:29:27 +00:00
Makefile Outdated
@ -18,3 +18,3 @@
cp favicon.ico $(DIST_DIR)/favicon.ico
cp *logo* $(DIST_DIR)/
cp templates/* $(DIST_DIR)/
cp -r templates/* $(DIST_DIR)/
jsheunis commented 2026-02-12 12:07:18 +00:00
Member
Copy link

this should be cp -r templates $(DIST_DIR)/ if we're going to use the same pattern as psyinf pool

this should be `cp -r templates $(DIST_DIR)/` if we're going to use the same pattern as psyinf pool
adina commented 2026-02-12 12:45:58 +00:00
Author
Member
Copy link

thx!

thx!
adina marked this conversation as resolved
config.yaml
@ -16,2 +15,4 @@
url: templates/DocumentUploadTemplate.ttl
FrontPageHTML:
url: frontpage.html
DOIWizardTemplate:
jsheunis commented 2026-02-12 12:11:34 +00:00
Member
Copy link

It's probably a good idea to use a single convention for file naming regarding cases. I started using pascal case initially because that's a thing in Javascript, and @mih used the dashes. I am not married to either, but I think we should select one and stick with it. The dashes do look a bit easier on the eye.

This would affect several config options but also filenames.

It's probably a good idea to use a single convention for file naming regarding cases. I started using pascal case initially because that's a thing in Javascript, and @mih used the dashes. I am not married to either, but I think we should select one and stick with it. The dashes do look a bit easier on the eye. This would affect several config options but also filenames.
adina commented 2026-02-12 12:45:49 +00:00
Author
Member
Copy link

I've picked the pascal case (and learned this term today)

I've picked the pascal case (and learned this term today)
adina marked this conversation as resolved
config.yaml Outdated
@ -18,0 +18,4 @@
DOIWizardTemplate:
url: templates/DOIWizardTemplate.ttl
DOIlogo:
url: images/DOI_logo_24.svg
jsheunis commented 2026-02-12 12:18:44 +00:00
Member
Copy link

After I added this line and the logo to the psyinf pool repo, I moved the logo also to https://hub.psychoinformatics.de/datalink/assets/src/branch/main/shacl-vue/DOI_logo_24.svg, and in TRR379 pool I reference that link. So that we don't have to distribute the same logo everywhere. So I think we can do the same here, i.e. same as hub.trr379.de/q02/pool.v0.trr379.de-ui@3647a04bd3/config.yaml (L78).

This means the images directory can be removed and the copy command can be removed from the makefile

After I added this line and the logo to the psyinf pool repo, I moved the logo also to https://hub.psychoinformatics.de/datalink/assets/src/branch/main/shacl-vue/DOI_logo_24.svg, and in TRR379 pool I reference that link. So that we don't have to distribute the same logo everywhere. So I think we can do the same here, i.e. same as https://hub.trr379.de/q02/pool.v0.trr379.de-ui/src/commit/3647a04bd3d16482afe80e1275ce24b3c5ea745d/config.yaml#L78. This means the images directory can be removed and the copy command can be removed from the makefile
adina commented 2026-02-12 12:44:55 +00:00
Author
Member
Copy link

thx, done!

thx, done!
adina marked this conversation as resolved
config.yaml
@ -54,0 +79,4 @@
# pattern:
# default:
template: content:DOIWizardTemplate
FileUploadWizard:
jsheunis commented 2026-02-12 12:08:18 +00:00
Member
Copy link

Looks like an indentation typo here

Looks like an indentation typo here
adina commented 2026-02-12 12:44:43 +00:00
Author
Member
Copy link

thx for spotting that!

thx for spotting that!
adina marked this conversation as resolved
config.yaml Outdated
@ -54,3 +100,4 @@
- FileUploadWizard
hide_classes:
- https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDistribution
- https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDataType
jsheunis commented 2026-02-12 12:15:53 +00:00
Member
Copy link

these two can be removed because they're still using the rse-group namespace (so they are doing nothing). First one shouldn't be replaced because the XYZDistribution class doesn't exist anymore. Whether you specifically want to hide XYZFile (the replacement) is up to you.

these two can be removed because they're still using the rse-group namespace (so they are doing nothing). First one shouldn't be replaced because the XYZDistribution class doesn't exist anymore. Whether you specifically want to hide XYZFile (the replacement) is up to you.
adina commented 2026-02-12 12:37:47 +00:00
Author
Member
Copy link

sorry, can you say concretely which can be removed? The webui places your comment such that is looks like it is about the first two items among the five. But I infer that https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDataType and https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZPublicationVenue shall be removed, and convention and competitionType kept?

sorry, can you say concretely which can be removed? The webui places your comment such that is looks like it is about the first two items among the five. But I infer that https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDataType and https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZPublicationVenue shall be removed, and convention and competitionType kept?
jsheunis commented 2026-02-12 12:49:39 +00:00
Member
Copy link

Yeah that is definitely a weird web ui thing. I was talking about :

hide_classes:
	  - https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDistribution
	  - https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDataType
Yeah that is definitely a weird web ui thing. I was talking about : ```yaml hide_classes: - https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDistribution - https://concepts.datalad.org/s/demo-rse-group/unreleased/XYZDataType ```
templates/DocumentUploadTemplate.ttl Outdated
@ -23,0 +14,4 @@
dlthings:distribution_of <{pid}>;
dlthings:byte_size "{size}"^^xsd:nonNegativeInteger;
dlthings:attributes _:n0-1.
_:n0-1 a dlthings:FlatAttributeSpecification;
jsheunis commented 2026-02-12 12:26:56 +00:00
Member
Copy link

I think this is outdated. The FlatAttributeSpecification doesn't exist anymore in the ri schema.

Actually, looking at the schema it shows that a XYZDocument has a distributions slot, which means with the current configuration the file-upload wizard would render for it. So this documentupload thing might not even be necessary, unless there is a reason via a specific user workflow that you think it's necessary?

I think this is outdated. The `FlatAttributeSpecification` doesn't exist anymore in the ri schema. Actually, looking at the schema it shows that a XYZDocument has a `distributions` slot, which means with the current configuration the `file-upload` wizard would render for it. So this documentupload thing might not even be necessary, unless there is a reason via a specific user workflow that you think it's necessary?
adina commented 2026-02-12 12:38:33 +00:00
Author
Member
Copy link

no, not specific reasoning at all. I was copy-pasting

no, not specific reasoning at all. I was copy-pasting
adina commented 2026-02-12 12:40:42 +00:00
Author
Member
Copy link

the webui again makes it difficult to guess what exactly can be removed.

This part, or more?

_:n0-1 a dlthings:FlatAttributeSpecification;
    rdf:value "{downloadUrl}"^^xsd:anyURI;
    rdf:predicate dcat:downloadUrl.
the webui again makes it difficult to guess what exactly can be removed. This part, or more? ``` _:n0-1 a dlthings:FlatAttributeSpecification; rdf:value "{downloadUrl}"^^xsd:anyURI; rdf:predicate dcat:downloadUrl. ```
jsheunis commented 2026-02-12 12:52:49 +00:00
Member
Copy link

I think we should remove the whole template. And then argue from the POV of a specific required use case whether a DocumentUploadTemplate (the way it was initially implemented, with the Communication association class and KeyInfoRole and gitAnnexUpload annotations) is still necessary or whether it would be better to use the more generic file upload wizard approach that was implemented recently.

I think we should remove the whole template. And then argue from the POV of a specific required use case whether a `DocumentUploadTemplate` (the way it was initially implemented, with the `Communication` association class and `KeyInfoRole` and `gitAnnexUpload` annotations) is still necessary or whether it would be better to use the more generic file upload wizard approach that was implemented recently.
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin updates:updates
git switch updates

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff updates
git switch updates
git rebase main
git switch main
git merge --ff-only updates
git switch updates
git rebase main
git switch main
git merge --no-ff updates
git switch main
git merge --squash updates
git switch main
git merge --ff-only updates
git switch main
git merge updates
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
jsheunis
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
www/kiste.abcd-j.de-ui!4
No description provided.