Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make it possible to define order of plugins in configuration #1201

Merged
merged 70 commits into from
Nov 2, 2021
Merged

Make it possible to define order of plugins in configuration #1201

merged 70 commits into from
Nov 2, 2021

Conversation

Vainonen
Copy link
Contributor

@Vainonen Vainonen commented Sep 9, 2021 •
edited by kouralex
Loading

Changes into function and variable names ii VocabularyConfig.php :

  • $plugins --> $pluginRegister
  • function getPlugins --> function getPluginRegister
  • json_encode function moved to WebController.php and test below omitted (new tests for encoding in webcontroller?)

Fixes #1148

Ahonen Mika J and others added 16 commits September 8, 2021 13:48
Added translations for skos:notation properties
276bf88
Added datatype labels to concept info query
faebcea
Show datatype on concept info page. Uri only for now.
2725e49
On the concept page a label for notation is shown
c273b91
On the concept page a label for the datatype is shown
fcb125f
Minor changes to improve readability of code
a4c88e6
Empty spaces between the data type label and the square brackets on t…
d7087f3 
…he concept page deleted
Displays a skos:notation with rdfs:Datatype and label in the properti…
72091cd 
…es on the concept page if it is set up to be shown. A default value for showing the notation is 'true'
Preparing to the merge: conflicts in the translations aligned with ma…
3bee24d 
…ster the master branch
An unnecessary method getPrefLabelInTheConceptPageHeaderWithNotation(…
790533e 
…) removed
2-3 options to choose from in the loop (lines 578 -> 595). This commi…
fba9465 
…t only helps keep the code safe.
Early check for the skos:notation if it is shown in the properties on…
f0a932d 
… the concept page
Vain indentation changes reverted
c6301a0
The checking if skos:notation should be shown in the properties was m…
68682d1 
…oved to the more reasonable location in the class
Added a docstring for the method getShowNotationAsProperty()
29f3e07
@Vainonen
add order of plugins
0b28daa
@Vainonen Vainonen requested review from osma and kouralex September 9, 2021 14:43
@codecov
Copy link

codecov bot commented Sep 9, 2021 •
edited
Loading

Codecov Report

Merging #1201 (148ded6) into master (7a570ff) will decrease coverage by 0.13%.
The diff coverage is 61.15%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1201      +/-   ##
============================================
- Coverage     68.71%   68.58%   -0.14%     
- Complexity     1598     1630      +32     
============================================
  Files            32       32              
  Lines          3929     3995      +66     
============================================
+ Hits           2700     2740      +40     
- Misses         1229     1255      +26
Impacted Files Coverage Δ
model/Request.php 67.85% <0.00%> (ø)
model/Vocabulary.php 84.61% <0.00%> (ø)
model/sparql/GenericSparql.php 92.14% <ø> (ø)
controller/WebController.php 16.15% <5.00%> (-0.62%) ⬇️
model/Model.php 80.97% <7.14%> (-2.72%) ⬇️
model/DataObject.php 67.39% <25.00%> (-10.11%) ⬇️
model/VocabularyConfig.php 95.00% <96.00%> (+1.46%) ⬆️
model/Concept.php 81.09% <100.00%> (+0.14%) ⬆️
model/ConceptProperty.php 96.42% <100.00%> (-3.58%) ⬇️
model/ConceptPropertyValue.php 86.25% <100.00%> (-0.50%) ⬇️
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7a570ff...148ded6. Read the comment docs.

kouralex
kouralex requested changes Sep 10, 2021
View reviewed changes
Copy link
Contributor

@kouralex kouralex left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor comments on files, looks otherwise very good!

Ps. the starting post could be updated to link to the issue this is fixing.

@Vainonen Vainonen self-assigned this Oct 25, 2021
osma added 2 commits November 2, 2021 09:51
@sonarcloud
Copy link

sonarcloud bot commented Nov 2, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@Vainonen Vainonen merged commit 00d3e88 into master Nov 2, 2021
@Vainonen Vainonen deleted the issue1148-order-of-plugins branch November 2, 2021 17:08
@osma osma changed the title add order of plugins Make it possible to define order of plugins in configuration Dec 8, 2021
@Vainonen Vainonen mentioned this pull request Dec 8, 2021
Closed
@Vainonen
Copy link
Contributor Author

Vainonen commented Dec 8, 2021

This fixes only a part of the issue #1148. Vocabulary-specific plugins can be configured and listed with skosmos:vocabulyPlugins, but the order listed in that property is changed when plugins are loaded. Therefore the issue is reopened.

@joelit joelit added this to the 2.13 milestone Dec 8, 2021
@Vainonen Vainonen mentioned this pull request Mar 3, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kouralex kouralex kouralex requested changes

@osma osma osma requested changes

Assignees

@Vainonen Vainonen

Labels
None yet
Projects
None yet
Milestone
2.13
Development

Successfully merging this pull request may close these issues.

Order of vocabulary-specific plugins is not configurable
6 participants
@Vainonen @osma @kouralex @joelit @kinow @miguelvaara