Merge development into master for 2026 Q1 update

* sidebar open filters position adjustment to true center

* adjusted z values for sidebar and the opening button. when sidebar shows that it lays above the opeing button

* pulled branch development, including fix to change $result->getResults() to $result->getResults()[results]

* development pulled bugfix has been fixed. Therefore changing it back

* reverted changes of app/View/Components/Forms/ and resources/views/components/forms/ for selectQuestion, checkBox, and radioSelect

* non survey form components view template from previous reverse added as comment as template to implement

* better responsiveness and spacing for XX-found and orderBy flags

* search list div top div basis conditional statement added

* reverted changes and hard coded components

* reverted changes and hard coded components

* map default view in center of europe

* adjusted data-access and data-publication bblades with the DataPublication class getters

* non refined translation of value usage on page

* info icon hover added

* data-acces: $result->getResult() to $result->getResult(true)

* non refined translation of value usage on page

* same file but with value import functions added to the ckan models

* functions added: getAllNameIdentifiers and getAllAffilitationNames

* functions added: getAllNameIdentifiers and getAllAffilitationNames

* function added: getDisplayInformation (we can argue about the name. not sure how you want it. more specific?

* data import adjusted to new models. map does not get shown for some reason

* dividers and description tabs added, map still not working. I will keep going

* text size increased for link

* removed divider from main div

* equipment detail basic setup with frontend controller

* adjusting to new frontend classes

* the map is still not working. I checked on resources/views/frontend/labs-map.blade.php how the string looks like and replicated the same structure here, yet it is not displaying anything

* z-index removed

* padding between tabs added

* added the new model based data structure to the grouped results of the lab equipment, this might be connected to the reason why the lab is not working

* Feature/MSL-490 Implement data publication v2 endpoints

* update EPOS service definition files. Remove outdated versions from project.

* contact lab button conditional fix

* minor fixes to facilities service descriptions

* include boundingbox paramters to facilities service definition

* empty check the checked element var

* changed count method

* changed naming and style of functions getAffilitationNames and getNameIdentifiers

* style changes

* display function removed

* changed facets var for filter tree

* changed count method

* importing vars via class instead of array

* array notation and empty highlighted tab for description

* affilitation and name ids: changed to new function names

* removed getDisplayInformation function

* empty space

* added facet var

* data p files view var import changed to class variation

* squash

* implement feedback

* rename abstract class

* implement feedback

* small changes

* abstract away another method

* cleanup

* fix bugs

* update all npm packages, update vite and plugin to new major versions

* remove duplicate functions in datapublication

* restore functionality of lab/equipment maps

* restore equipment/lab list views

* revert lab object usage changes

* add missing div class to fix map display on lab detail page

* correct data publication found number

* package lock update

* added underline to source link

* lab equipment total count var added

* about page refactor

* data repos overview refactor

* text primary colour shade 900 for all pages

* about page: removed y divider

* contribute lab refactor

* added text-block style: responsive mod

* remove unneeded functions in relatedidentifier

* remove all size function calls with count

* remove all size function calls with count

* remove mixed array long notations

* small consistency changes data-publication-detail page'

* fix no geolocations display check

* fix no geolocations display check

* fix incorrect display of domain information

* simplify author seperator loop

* added contribute poposal

* simplify author seperator loop

* remove commented code

* styles updates for p-tag and added limited-max-width-md

* text block class removed

* contribute project refactor

* remove data processing from file detail template

* add missing array/object conversion in file detail template

* remove display of extensions for folders

* remove folders from extension list

* improve variable naming data publication detailfiles page

* improve variable naming data publication detail page

* lint php files

* keyword selector refactor

* keyword selector refactor

* contact us route to navbar and footer

* contact us additonal subjects

* unused component for now. added survey radio component as comment to adjust when used

* adjusted style to survey one

* small adjustment of bg colour

* refactor page to new divs

* in text links with underline and hover interaction

* added contribute project to footer

* hover interaction in text links

* removed comment

* change datasetcount link on index page to go to data-access instead of labs page'

* checkbox in survey behaviour

* checkbox getting check mark not radio button look

* fixed looks of radio select for survey

* hover interactive for radio button

* add padding to title for lab intake form

* correct data/datapublication naming after merge

* rename result count parameter

* rename component variable name

* replace long array notations and fix some outlining

* renaming variables in about template

* update package-lock file

* remove comments from contribute-laboratory

* outlining contribute-repository

* harmonize frontendcontroller return statement

* rename variable of search-div-list component to improve clarity

* rename sorting options variables

* select active sort in sort dropdown on the data-access page

* rename data variable to datapublication in datapublication list component

* remove unused commented out divs

* rename data to equipment for equipment template, use single name

* clean variable naming in lab-detail-equipment and cleanup controller function

* rename data to laboratory for lab-detail page

* rename result to laboratories for lab-list-blade'

* outlining labs-map-blade

* remove unused comments from layout_main

* remove unused test component

* remove unused comment

* remove array long notation

* remove array long notations

* clean arrays in survey-gallery templates

* add prettier and blade plugin to dev packages

* setup prettier config

* update package lock

* fix bug in data-access page and update package file

* lint all blade templates

* package lock

* hover interactive for navbar buttons

* small screen menu main button colour

* small screen dropdown menu behaviour

* pagination chevron visibility small screens

* text truncate on dp-detail-files

* lint php/blade

* small cleanup of classes

* MSL-486 Implement first version of data-publications map (#189)

* test tracking with changes from default js to work from local setup

* change tooltip inclusion on datapublication file page to work with new ts setup

* test tracking with changes from default js to work from local setup

* move tracker to seperate file, use env variables to connect to matomo

* add env setting to disable tracking

* use siteId set in env file

* add information to source and changes to tracking code

* Fix admin page (#200)

* Implement list view in datapublication map

* Fix a window type

* Update tsconfig based on vite's docs

* Lower opacity of layers in map

* add new combined vocab rdf exports, use in general vocab export command, update exports

* MSL_631 keyword selector scaling (#205)

* MSL_644 Improve directory structure (#204)

* split epos ld exports to single files

* replace rdfs labels with skos preflabels

* change uri litterals to resources

* add resource improvements from epos rdf export to regular one

* convert msl uris to epos uris, add references to msl uris, add inscheme links

* update all generated vocab exports

* Fix maps breaking in production (#207)

Co-authored-by: Samsh001 <l.samshuijzen@uu.nl>

* include matomo library

* cleanup v1 ApiController a bit; typos/types

* setup tracking env and config

* create middleware to track requests in Matomo, apply middleware to all api routes

* move tracking call from middleware to job to prevent waiting for request to matomo server

* rename page tracking job

* add fileDownload route to track downloads

* add download tracking job and fire from download redirecter

* alter downloadlink on datapublication detail page to use new download redirector

* replace direct downloadlink in V1 API datapublication endpoint with links to download redirector

* adjust downloadlinks in v2 data publication endpoints to use download redirector

* add topConceptOf to highest level concepts

* add additional properties required for display in the EPOS application, add relevant namespaces

* change litterals to resources

* update exports

* MSL-650 Implement geo feature ordering (#203)

* Update app/Http/Resources/V2/Elements/FileCollection.php

Co-authored-by: Dionysia Nakou <47860263+dionenak@users.noreply.github.com>

* inject DataPublicationService into fileDownload function in controller

* adjust EPOS uris

* update all exports

* MSL-660 Fix scrolling in sidebar of datapublication map (#213)

* fix tests failing after download link changes

* remove deprecated combined export class and usage

* rename exporters to individual usage

* return uri if no matches are found for epos uri conversion

* adjust EposRdfExport to work with vocabulary versions

* update 4tu import data

* update bgs import data

* update csic import data

* update gfz import data

* update yoda data publicationlist for importing

* added routing for DP map and implemented the tab links for the data access page

* MSL-648 Implement result set option (#217)

* changed naming: location to map

* Improve naming of tabs in datapublication sidebar

* Merge MSL-675 (#220)

* suffix listener classes

* suffix all commands with -command

* suffix all mail classes with -Mail, adjust usage

* updated images

* added fieldscalelabs info: text and image links

* added a fieldscalelabs field

* removed old testbeds template

* replaced route testbeds with new fieldscalelabs

* minor text corrections

* Remove map wrapping (#219)

* Revert "added routing for DP map and implemented the tab links for the data access page" and "changed naming: location to map" (#225)

This reverts commits 3f15908 and 9c00b7b.

* add testbeds again and set to inactive to keep existing answers on production

* better seeder structure with some refactoring

* lint/pint php code

* lint blade files

* update package-lock

---------

Co-authored-by: Nothbaum <m.nothbaum@uu.nl>
Co-authored-by: Dionysia Nakou <47860263+dionenak@users.noreply.github.com>
Co-authored-by: d.nakou@uu.nl <d.nakou@uu.nl>

Author: 3 people

.env.example

@@ -61,3 +61,12 @@ FAST_API_TOKEN=
 VOCABULARIES_CURRENT_VERSION=1.3
 
 RUN_BEHIND_PROXY=false
+
+TRACKING_ENABLED=
+MATOMO_HOST=
+MATOMO_SITE_ID=
+MATOMO_TOKEN=
+
+VITE_TRACKING_ENABLED="${TRACKING_ENABLED}"
+VITE_MATOMO_HOST="${MATOMO_HOST}"
+VITE_MATOMO_SITE_ID="${MATOMO_SITE_ID}"

.prettierrc

@@ -0,0 +1,12 @@
+{
+  "plugins": ["@shufo/prettier-plugin-blade"],
+  "overrides": [
+    {
+      "files": ["*.blade.php"],
+      "options": {
+        "parser": "blade",
+        "tabWidth": 4
+      }
+    }
+  ]
+}