Merge branch 'master' into AV-2064_remove-resource-proxy

vrk-kpa · Oct 3, 2023 · 6ad5179 · 6ad5179
2 parents e90ffac + 5dce606
commit 6ad5179
Show file tree

Hide file tree

Showing 69 changed files with 1,628 additions and 4,428 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -64,21 +64,41 @@ jobs:
   stylelint:
     name: stylelint
     runs-on: ubuntu-latest
-    container: node:14
     steps:
       - uses: actions/checkout@v3
-      - name: Install Dependencies
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'npm'
+          cache-dependency-path: opendata-assets/package-lock.json
+
+      - name: cache node_modules
+        uses: actions/cache@v3
+        id: cache-node_modules
+        with:
+          path: ./opendata-assets/node_modules
+          key: ${{ runner.os }}-build-node_v20-${{ hashFiles('opendata-assets/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-node_v20-
+
+      - name: Authenticate npm registry
+        if: ${{ steps.cache-node_modules.outputs.cache-hit != 'true' }}
         run: |
           cat <<EOT >> .npmrc
           @fortawesome:registry=https://npm.fontawesome.com/
           //npm.fontawesome.com/:_authToken=$NPM_TOKEN
           EOT
-          npm ci
         working-directory: ./opendata-assets
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: install npm packages
+        if: ${{ steps.cache-node_modules.outputs.cache-hit != 'true' }}
+        run: npm ci
+        working-directory: ./opendata-assets
+
       - name: run stylelint
-        run: $(npm bin)/stylelint "src/less"
+        run: npx stylelint "src/less" -f github
         working-directory: ./opendata-assets
 
   slack:

diff --git a/ckan/ckanext/ckanext-ytp_comments/ckanext/ytp_comments/email_template.py b/ckan/ckanext/ckanext-ytp_comments/ckanext/ytp_comments/email_template.py
@@ -21,6 +21,6 @@
 
 Best regards
 
-Avoindata.fi support
+Suomi.fi Open Data support
 [email protected]
 """)
diff --git a/ckan/ckanext/ckanext-ytp_main/README.md b/ckan/ckanext/ckanext-ytp_main/README.md
@@ -1,7 +1,7 @@
 ckanext-ytp-main
 ================
 
-Main CKAN extension for avoindata.fi
+Main CKAN extension for Suomi.fi Open Data
 
 Installation
 ------------

diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/dcat.py b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/dcat.py
@@ -588,10 +588,10 @@ def graph_from_catalog(self, catalog_dict, catalog_ref):
         title = p.config.get('ckan.site_title', '')
         g.add((catalog_ref, DCT.title, Literal(title)))
 
-        description = ('Suomen kansallinen avoimen datan portaali. Avoindata.fi on kaikille tarkoitettu palvelu avoimen '
+        description = ('Suomen kansallinen avoimen datan portaali. Suomi.fi-avoindata on kaikille tarkoitettu palvelu avoimen '
                        'datan julkaisemiseen ja hyödyntämiseen. Den finska nationella dataportalen för öppna data. '
-                       'Avoindata.fi är en tjänst för att publicera och utnyttja öppna data. The Finnish national open data '
-                       'portal. Opendata.fi is a service for publishing and utilising open data for everyone.')
+                       'Suomi.fi-öppnadata är en tjänst för att publicera och utnyttja öppna data. The Finnish national open '
+                       'data portal. Suomi.fi Open Data is a service for publishing and utilising open data for everyone.')
         g.add((catalog_ref, DCT.description, Literal(description)))
 
         spatial = 'koko Suomi, hela Finland, entire Finland'

diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/email_templates/avoindata_signature.py b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/email_templates/avoindata_signature.py
@@ -4,9 +4,9 @@
 def signature(lang):
     if lang == 'fi':
         return """Ystävällisin terveisin,
-Avoindata.fi tuki
+Suomi.fi-avoindata tuki
 """
 
     return """Best regards,
-Avoindata.fi support
+Suomi.fi Open Data support
 """
diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/email_templates/deprecation_email_user.py b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/email_templates/deprecation_email_user.py
@@ -29,12 +29,12 @@ def messageBody(user, packages):
 
 
 
-subject = "Tietoaineistojesi viimeinen voimassaolopäivä Avoindata.fi-palvelussa umpeutui {valid_till} - You have datasets in Avoindata.fi that were marked as deprecated on {valid_till}" # noqa
+subject = "Tietoaineistojesi viimeinen voimassaolopäivä Suomi.fi-avoindatassa umpeutui {valid_till} - You have datasets in Suomi.fi Open Data that were marked as deprecated on {valid_till}" # noqa
 
 messageBodyTemplate = """
 Hei,
 
-Ylläpidät tietoaineistoja Avoindata.fi-palvelussa ja olet merkinnyt niille viimeisen voimassaolopäivän.
+Ylläpidät tietoaineistoja Suomi.fi-avoindatassa ja olet merkinnyt niille viimeisen voimassaolopäivän.
 
 Alla listatut tietoaineistosi ovat vanhentuneet {valid_till}. Ilmoitimme sinulle tietoaineistojesi vanhentumisesta
 ennen niiden viimeistä voimassaolopäivää. Voit vieläkin muuttaa tietoaineistojen voimassaoloa kirjautumalla palveluun, valitsemalla
@@ -49,12 +49,12 @@ def messageBody(user, packages):
 --
 Hello,
 
-You have uploaded a dataset or datasets in Avoindata.fi and set an expiration date for the data.
+You have uploaded a dataset or datasets in Suomi.fi Open Data and set an expiration date for the data.
 
 The data sets below were marked as deprecated on {valid_till}. We notified you of the expiration prior to the date of expiration.
 
 You can still extend the validity of your data set(s) by logging in the service, navigating to the expiring dataset, and updating the date in the  Valid until field.
-Alternatively you can upload a newer version of the data set with a later expiration date in the service. Your data sets will not be removed from Avoindata.fi.
+Alternatively you can upload a newer version of the data set with a later expiration date in the service. Your data sets will not be removed from Suomi.fi Open Data.
 Our users will see the data sets as expired.
 
 Should you have any questions or need help, please get in touch with us at [email protected].

diff --git a/...t/ckanext-ytp_main/ckanext/ytp/templates/report/administrative_branch_summary_report.html b/...t/ckanext-ytp_main/ckanext/ytp/templates/report/administrative_branch_summary_report.html
@@ -78,4 +78,4 @@
     {% endfor %}
   </tbody>
 </table>
-<p>{{ _('Dataset counts are based on submission statistics from avoindata.fi. Open data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 for evaluating open data. More information on the metric is available at <a href=\"http://5stardata.info\">http://5stardata.info</a>.')|safe}}</p>
+<p>{{ _('Dataset counts are based on submission statistics from Suomi.fi Open Data. Open data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 for evaluating open data. More information on the metric is available at <a href=\"http://5stardata.info\">http://5stardata.info</a>.')|safe}}</p>
diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/templates/sparql/query.html b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/templates/sparql/query.html
@@ -15,7 +15,7 @@
   <h1>{% trans %}SPARQL search{% endtrans %}</h1>
   <section class="page-description">
     <p>
-    {% trans %}You can use the SPARQL search to find datasets and their metadata by using SPARQL query language. Datasets on opendata.fi are published as RDF triples and they follow the DCAT-AP specification. You can find information on <a href="https://www.avoindata.fi/ns/">opendata.fi’s DCAT AP extension here</a>.{% endtrans %}
+    {% trans %}You can use the SPARQL search to find datasets and their metadata by using SPARQL query language. Datasets on Suomi.fi Open Data are published as RDF triples and they follow the DCAT-AP specification. You can find information on <a href="https://www.avoindata.fi/ns/">Suomi.fi Open Data’s DCAT AP extension here</a>.{% endtrans %}
     </p>
 
     <p>

diff --git a/ckan/ckanext/ckanext-ytp_request/ckanext/ytp_request/mail.py b/ckan/ckanext/ckanext-ytp_request/ckanext/ytp_request/mail.py
@@ -20,7 +20,7 @@ def _MESSAGE_MEMBERSHIP_REQUEST():
 
 Best regards
 
-Avoindata.fi support
+Suomi.fi Open Data support
 [email protected]
 """)
 
@@ -36,7 +36,7 @@ def _MESSAGE_MEMBERSHIP_APPROVED():
 
 Best regards
 
-Avoindata.fi support
+Suomi.fi Open Data support
 [email protected]
 """)
 
@@ -52,7 +52,7 @@ def _MESSAGE_MEMBERSHIP_REJECTED():
 
 Best regards
 
-Avoindata.fi support
+Suomi.fi Open Data support
 [email protected]
 """)
 

diff --git a/ckan/templates/production.ini.j2 b/ckan/templates/production.ini.j2
@@ -75,7 +75,7 @@ scheming.group_schemas = ckanext.ytp.schemas:group.json
 scheming.organization_schemas = ckanext.ytp.schemas:organization.json
 advancedsearch.schema = ckanext.advancedsearch:search_fields.json
 
-ckan.site_title = avoindata.fi
+ckan.site_title = Suomi.fi-avoindata
 ckan.site_logo =
 ckan.site_description =
 

diff --git a/doc/Avoindata-rest-api_1.0.1_swagger.yaml b/doc/Avoindata-rest-api_1.0.1_swagger.yaml
@@ -34,7 +34,7 @@ info:
     \ dialog by clicking _Authorize_ button.\n\n# Datamodels\n\nAll datamodels used\
     \ are defined in separate service. LINKS HERE!\n"
   version: "1.0.0"
-  title: "Avoindata.fi API"
+  title: "Suomi.fi Open Data API"
   contact:
     email: "[email protected]"
   license:

diff --git a/doc/README.md b/doc/README.md
@@ -1,7 +1,7 @@
 
 # Documentation
 
-Welcome to the documentation of Avoindata.fi. This documentation is mainly aimed at developers.
+Welcome to the documentation of Suomi.fi Open Data. This documentation is mainly aimed at developers.
 
 ## Table of contents
 

diff --git a/doc/dcat-ap/README.md b/doc/dcat-ap/README.md
@@ -1,4 +1,4 @@
-# Avoindata.fi DCAT-AP extension
+# Suomi.fi Open Data DCAT-AP extension
 
 ## Validation
 

diff --git a/doc/dcat-ap/template.html.j2 b/doc/dcat-ap/template.html.j2
@@ -2,11 +2,11 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <title>Avoindata.fi DCAT-AP extension</title>
+    <title>Suomi.fi Open Data DCAT-AP extension</title>
     <link rel="stylesheet" href="/resources/vendor/bootstrap.min.css">
   </head>
   <body class="container">
-    <h1>Avoindata.fi DCAT-AP extension</h1>
+    <h1>Suomi.fi Open Data DCAT-AP extension</h1>
 
     <h2>Validation</h2>
     <p>Documents can be validated against this specification with a <a href="https://www.w3.org/TR/shacl/">SHACL</a> processor using these schema files:

diff --git a/doc/dcat-ap/template.md.j2 b/doc/dcat-ap/template.md.j2
@@ -1,4 +1,4 @@
-# Avoindata.fi DCAT-AP extension
+# Suomi.fi Open Data DCAT-AP extension
 
 ## Validation
 

diff --git a/docker/.env.template b/docker/.env.template
@@ -3,10 +3,10 @@ REGISTRY=""
 REPOSITORY=""
 
 # opendata images
-CKAN_IMAGE_TAG="c5e8ee3206c99fa8af3ef46c5cadd1b230bcfc4e"
-DRUPAL_IMAGE_TAG="c5e8ee3206c99fa8af3ef46c5cadd1b230bcfc4e"
+CKAN_IMAGE_TAG="cc823d149f1f80af4354a6f38973cec9fb994cc1"
+DRUPAL_IMAGE_TAG="cc823d149f1f80af4354a6f38973cec9fb994cc1"
 SOLR_IMAGE_TAG="acedaa3c1d35875178b6d104fe413bef0bbdd155"
-NGINX_IMAGE_TAG="239e3fa712006ef1cf2ccf6940098f50c9614702"
+NGINX_IMAGE_TAG="cc823d149f1f80af4354a6f38973cec9fb994cc1"
 DATAPUSHER_IMAGE_TAG="37245d2426ed6218a7352115d4147139defc9d8e"
 
 # 3rd party images

diff --git a/docker/nginx/www/ns/index.html b/docker/nginx/www/ns/index.html
@@ -2,11 +2,11 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <title>Avoindata.fi DCAT-AP extension</title>
+    <title>Suomi.fi Open Data DCAT-AP extension</title>
     <link rel="stylesheet" href="/resources/vendor/bootstrap.min.css">
   </head>
   <body class="container">
-    <h1>Avoindata.fi DCAT-AP extension</h1>
+    <h1>Suomi.fi Open Data DCAT-AP extension</h1>
 
     <h2>Validation</h2>
     <p>Documents can be validated against this specification with a <a href="https://www.w3.org/TR/shacl/">SHACL</a> processor using these schema files:

diff --git a/drupal/modules/avoindata-header/templates/avoindata_search.html.twig b/drupal/modules/avoindata-header/templates/avoindata_search.html.twig
@@ -16,7 +16,7 @@
 
     {% set placeholder %}
         {%- trans -%}
-        Search avoindata.fi...
+        Search Suomi.fi Open Data...
         {%- endtrans -%}
     {% endset %}
 

diff --git a/drupal/modules/avoindata-infobox/templates/avoindata_infobox_block.html.twig b/drupal/modules/avoindata-infobox/templates/avoindata_infobox_block.html.twig
@@ -26,7 +26,7 @@
                     <div class="avoindata-infobox-content">
                       <p>
                         {% trans %}
-                        Avoindata.fi service offers over 1000 interesting data sets available for everyone to download, inspect and use freely.
+                        Suomi.fi Open Data service offers over 1000 interesting data sets available for everyone to download, inspect and use freely.
                         {% endtrans %}
                       </p>
                     </div>

diff --git a/drupal/modules/avoindata-theme/README.md b/drupal/modules/avoindata-theme/README.md
@@ -5,10 +5,6 @@
 
 The Drupal 8 theme used at avoindata.fi is built on [Drupal Bootstrap](https://www.drupal.org/project/bootstrap) 8.x-3.x base theme.
 
-## Installation
-
-Avoindata.fi uses Ansible to move this repository in Drupal's theme folder, and Drush to enable the subtheme and set it as default theme. The code can be found at [Opendata repository](https://github.com/vrk-kpa/opendata).
-
 ## opendata-assets
 
 This theme should be used together with [opendata-assets](https://github.com/vrk-kpa/opendata/tree/master/opendata-assets).

diff --git a/drupal/site_config/language/fi/metatag.metatag_defaults.front.yml b/drupal/site_config/language/fi/metatag.metatag_defaults.front.yml
@@ -1,2 +1,2 @@
 tags:
-  description: 'Avoindata.fi on Suomen avoimen datan katalogi. Palvelu kokoaa kaiken Suomessa julkaistun avoimen datan yhteen paikkaan. Tule, hyödynnä tai julkaise!'
+  description: 'Suomi.fi-avoindata on Suomen avoimen datan katalogi. Palvelu kokoaa kaiken Suomessa julkaistun avoimen datan yhteen paikkaan. Tule, hyödynnä tai julkaise!'
diff --git a/drupal/site_config/language/sv/metatag.metatag_defaults.front.yml b/drupal/site_config/language/sv/metatag.metatag_defaults.front.yml
@@ -1,3 +1,3 @@
 label: Startsida
 tags:
-  description: 'Avoindata.fi är katalogen för öppna data utgiven i Finland. Vi samlar all öppna data ihop in en tjänst för dig at utnyttja eller publicera via oss.'
+  description: 'Suomi.fi-öppnadata är katalogen för öppna data utgiven i Finland. Vi samlar all öppna data ihop in en tjänst för dig at utnyttja eller publicera via oss.'
diff --git a/drupal/site_config/metatag.metatag_defaults.front.yml b/drupal/site_config/metatag.metatag_defaults.front.yml
@@ -5,7 +5,7 @@ id: front
 label: Frontpage
 tags:
   title: '[site:name]'
-  description: 'Avoindata.fi is Finland’s open data catalogue. The portal gathers all open data published in Finland in a single service. Come, use it, or publish via us!'
+  description: 'Suomi.fi Open Data is Finland’s open data catalogue. The portal gathers all open data published in Finland in a single service. Come, use it, or publish via us!'
   canonical_url: '[site:url]'
   shortlink: '[site:url]'
   og_title: '[current-page:title]'

diff --git a/opendata-assets/.stylelintrc b/opendata-assets/.stylelintrc
@@ -1,6 +1,10 @@
 {
-  "extends": "stylelint-config-standard",
+  "extends": "stylelint-config-standard-less",
   "rules": {
-    "no-descending-specificity": null
+    "no-descending-specificity": null,
+    "selector-class-pattern": null,
+    "selector-id-pattern": null,
+    "less/no-duplicate-variables": null,
+    "media-feature-range-notation": null
   }
 }
diff --git a/opendata-assets/gulpfile.js b/opendata-assets/gulpfile.js
@@ -14,7 +14,7 @@ var pump = require("pump");
 var npmDist = require('gulp-npm-dist');
 var rename = require('gulp-rename');
 var imageminJpegoptim = require('imagemin-jpegoptim');
-var gulpStylelint = require('gulp-stylelint');
+var gulpStylelint = require("@ronilaukkarinen/gulp-stylelint");
 
 var paths = {
   src: {
@@ -97,7 +97,7 @@ gulp.task('lint', (done) => {
     gulpStylelint({
       failAfterError: true,
       reporters:[
-        {formatter: 'verbose', console: true}
+        {formatter: 'string', console: true}
       ]})
   ], done)
 });