Merge branch 'development' into dependabot/npm_and_yarn/ip-1.1.9

kbss-cvut · Feb 21, 2024 · 0c68be7 · 0c68be7
2 parents e50ac7c + 69c4cae
commit 0c68be7
Show file tree

Hide file tree

Showing 7 changed files with 246 additions and 137 deletions.
diff --git a/.github/workflows/merge-to-protected.yml b/.github/workflows/merge-to-protected.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           node-version: "16.x"
       - name: Install
-        run: npm install --legacy-peer-deps
+        run: npm install
       - name: Prettier Check
         run: npm run prettier:check
       - name: Build

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "@fortawesome/fontawesome-free": "^6.4.0",
     "@opendata-mvcr/assembly-line-shared": "^0.3.2",
     "apexcharts": "^3.41.0",
-    "axios": "^1.6.2",
+    "axios": "^1.6.5",
     "bootstrap": "4.6.2",
     "chart.js": "^3.9.1",
     "classnames": "^2.3.2",
@@ -19,7 +19,7 @@
     "easymde": "2.15.0",
     "html-to-react": "1.5.0",
     "htmlparser2": "^4.1.0",
-    "intelligent-tree-select": "0.11.1",
+    "intelligent-tree-select": "0.11.4",
     "iso-639-1": "^2.1.15",
     "javascript-time-ago": "2.5.9",
     "js-cookie": "^3.0.5",
@@ -95,7 +95,7 @@
     "@types/whatwg-mimetype": "^2.1.1",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "axios-mock-adapter": "^1.22.0",
-    "babel-plugin-macros": "3.1.0",
+    "babel-plugin-macros": "2.8.0",
     "cross-env": "^7.0.3",
     "enzyme": "^3.11.0",
     "husky": "^7.0.4",

diff --git a/src/component/statistics/assetcount/AssetCount.rq b/src/component/statistics/assetcount/AssetCount.rq
@@ -1,9 +1,13 @@
+PREFIX pdp: <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/>
 PREFIX termit: <http://onto.fel.cvut.cz/ontologies/application/termit/pojem/>
 
 CONSTRUCT {
     ?assetType termit:has-count ?count
 } WHERE {
     SELECT (COUNT(DISTINCT ?asset) AS ?count) {
-        ?asset a ?assetType
+        ?asset a ?assetType .
+        FILTER NOT EXISTS {
+            ?asset a pdp:verze-objektu .
+        }
     }
 }
diff --git a/src/component/statistics/assetcount/TermCount.rq b/src/component/statistics/assetcount/TermCount.rq
@@ -1,3 +1,4 @@
+PREFIX pdp: <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/>
 PREFIX termit: <http://onto.fel.cvut.cz/ontologies/application/termit/pojem/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 
@@ -8,6 +9,9 @@ CONSTRUCT {
         GRAPH ?v {
             ?asset a skos:Concept .
             ?v <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/má-glosář> ?g .
+            FILTER NOT EXISTS {
+                ?asset a pdp:verze-pojmu .
+            }
         }
     }
 }
diff --git a/src/component/statistics/termfrequency/TermFrequency.rq b/src/component/statistics/termfrequency/TermFrequency.rq
@@ -1,4 +1,4 @@
-PREFIX a-popis-dat-pojem: <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/>
+PREFIX pdp: <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX termit: <http://onto.fel.cvut.cz/ontologies/application/termit/pojem/>
@@ -10,7 +10,10 @@ CONSTRUCT {
 } WHERE {
     SELECT ?slovnik ?labelSlovniku ( COUNT(DISTINCT ?pojem) AS ?count ) {
 	    ?pojem a skos:Concept ;
-           	a-popis-dat-pojem:je-pojmem-ze-slovníku ?slovnik .
+           	pdp:je-pojmem-ze-slovníku ?slovnik .
+           	FILTER NOT EXISTS {
+                ?slovnik a pdp:verze-slovníku .
+            }
         OPTIONAL {
        	    ?slovnik dc:title ?labelS .
        	}

diff --git a/src/component/statistics/termtypefrequency/TermTypeFrequency.rq b/src/component/statistics/termtypefrequency/TermTypeFrequency.rq
@@ -1,4 +1,4 @@
-PREFIX a-popis-dat-pojem: <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/>
+PREFIX pdp: <http://onto.fel.cvut.cz/ontologies/slovník/agendový/popis-dat/pojem/>
 PREFIX z-sgov-pojem: <https://slovník.gov.cz/základní/pojem/>
 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
@@ -7,14 +7,17 @@ PREFIX dc: <http://purl.org/dc/terms/>
 
 CONSTRUCT {
     ?pojem  a ?typ;
-            a-popis-dat-pojem:je-pojmem-ze-slovníku ?slovnik .
+            pdp:je-pojmem-ze-slovníku ?slovnik .
     ?slovnik rdfs:label ?labelSlovniku .
 
     ?type rdfs:label ?labelTypu .
 } WHERE {
 	{
 	    ?pojem a skos:Concept ;
-       	a-popis-dat-pojem:je-pojmem-ze-slovníku ?slovnik .
+       	pdp:je-pojmem-ze-slovníku ?slovnik .
+       	FILTER NOT EXISTS {
+            ?slovnik a pdp:verze-slovníku .
+        }
         OPTIONAL {
    	        ?slovnik dc:title ?labelS .
    	    }
@@ -27,7 +30,7 @@ CONSTRUCT {
                           z-sgov-pojem:typ-vztahu,
                           z-sgov-pojem:typ-události ))
         }
-        BIND(COALESCE(?t,a-popis-dat-pojem:not-filled) as ?typ)
+        BIND(COALESCE(?t,pdp:not-filled) as ?typ)
     } UNION {
         VALUES (?type) { (z-sgov-pojem:typ-objektu)
                          (z-sgov-pojem:typ-vlastnosti)