feat: use new CMS urls everywhere in codebase, also in RHHC

done:
 - replace ".hkih.stage.geniem.io" with ".app-staging.hkih.hion.dev"
   - e.g. https://liikunta.hkih.stage.geniem.io/graphql ->
     https://harrastus.app-staging.hkih.hion.dev/graphql
 - use RHHC v1.0.0-alpha292 that uses new CMS urls

refs LIIKUNTA-669

README.md

@@ -386,11 +386,11 @@ How to set build arguments and/or config map variables (pod runtime environment
   parameters:
     buildArgs:
       NEXTJS_DISABLE_SENTRY: 1
-      CMS_ORIGIN: https://harrastus.hkih.stage.geniem.io
+      CMS_ORIGIN: https://harrastus.app-staging.hkih.hion.dev
     configMap:
       DEBUG: 1
       MATOMO_ENABLED: 0
-      CMS_ORIGIN: https://harrastus.hkih.stage.geniem.io
+      CMS_ORIGIN: https://harrastus.app-staging.hkih.hion.dev
 ```
 
 ## 6. Editor support

apps/events-helsinki/.env.test

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
 FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-events.test.hel.ninja/
-CMS_ORIGIN=https://tapahtumat.hkih.stage.geniem.io
+CMS_ORIGIN=https://tapahtumat.app-staging.hkih.hion.dev
 LINKEDEVENTS_EVENT_ENDPOINT=https://api.hel.fi/linkedevents/v1/event
 NEXT_PUBLIC_IMAGE_PROXY_URL=https://images.weserv.nl/?w=1024&url=

apps/events-helsinki/README.md

@@ -20,7 +20,7 @@ This is a [Next.js](https://nextjs.org/) project originally bootstrapped with [`
 
 ### Headless CMS datasources
 
-- Test / Staging: https://tapahtumat.hkih.stage.geniem.io/graphql ([Wordpress-admin](https://tapahtumat.hkih.stage.geniem.io/wp-admin/))
+- Test / Staging: https://tapahtumat.app-staging.hkih.hion.dev/graphql ([Wordpress-admin](https://tapahtumat.app-staging.hkih.hion.dev/wp-admin/))
 - Production: https://tapahtumat.content.api.hel.fi/wp-admin/graphql ([Wordpress-admin](https://tapahtumat.content.api.hel.fi/wp-admin/wp-admin/))
 
 ### Route (pages)

apps/events-helsinki/package.json

@@ -71,7 +71,7 @@
     "react-datepicker": "^4.14.1",
     "react-dom": "18.2.0",
     "react-error-boundary": "4.0.10",
-    "react-helsinki-headless-cms": "1.0.0-alpha291",
+    "react-helsinki-headless-cms": "1.0.0-alpha292",
     "react-i18next": "13.0.1",
     "react-scroll": "^1.8.9",
     "react-toastify": "^9.1.3",

apps/hobbies-helsinki/.env.test

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
 FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-hobbies.test.hel.ninja/
-CMS_ORIGIN=https://harrastus.hkih.stage.geniem.io
+CMS_ORIGIN=https://harrastus.app-staging.hkih.hion.dev
 LINKEDEVENTS_EVENT_ENDPOINT=https://api.hel.fi/linkedevents/v1/event
 NEXT_PUBLIC_IMAGE_PROXY_URL=https://images.weserv.nl/?w=1024&url=

apps/hobbies-helsinki/README.md

@@ -20,7 +20,7 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next
 
 ### Headless CMS datasources
 
-- Test / Staging: https://harrastus.hkih.stage.geniem.io/graphql ([Wordpress-admin](https://harrastus.hkih.stage.geniem.io/wp-admin/))
+- Test / Staging: https://harrastus.app-staging.hkih.hion.dev/graphql ([Wordpress-admin](https://harrastus.app-staging.hkih.hion.dev/wp-admin/))
 - Production: https://harrastus.content.api.hel.fi/wp-admin/graphql ([Wordpress-admin](https://harrastus.content.api.hel.fi/wp-admin/wp-admin/))
 
 ### Route (pages)

apps/hobbies-helsinki/package.json

@@ -71,7 +71,7 @@
     "react-datepicker": "^4.14.1",
     "react-dom": "18.2.0",
     "react-error-boundary": "4.0.10",
-    "react-helsinki-headless-cms": "1.0.0-alpha291",
+    "react-helsinki-headless-cms": "1.0.0-alpha292",
     "react-i18next": "13.0.1",
     "react-scroll": "^1.8.9",
     "react-toastify": "^9.1.3",

apps/sports-helsinki/.env.test

@@ -1,5 +1,5 @@
 NEXT_PUBLIC_APP_ORIGIN=http://localhost:3000
 FEDERATION_ROUTER_ENDPOINT=https://events-graphql-federation-hobbies.test.hel.ninja/
-CMS_ORIGIN=https://liikunta.hkih.stage.geniem.io
+CMS_ORIGIN=https://liikunta.app-staging.hkih.hion.dev
 LINKEDEVENTS_EVENT_ENDPOINT=https://api.hel.fi/linkedevents/v1/event
 NEXT_PUBLIC_IMAGE_PROXY_URL=https://images.weserv.nl/?w=1024&url=

apps/sports-helsinki/README.md

@@ -20,7 +20,7 @@ This is a [Next.js](https://nextjs.org/) project originally bootstrapped with [`
 
 ### Headless CMS datasources
 
-- Test / Staging: https://liikunta.hkih.stage.geniem.io/graphql ([Wordpress-admin](https://liikunta.hkih.stage.geniem.io/wp-admin/))
+- Test / Staging: https://liikunta.app-staging.hkih.hion.dev/graphql ([Wordpress-admin](https://liikunta.app-staging.hkih.hion.dev/wp-admin/))
 - Production: https://liikunta.content.api.hel.fi/wp-admin/graphql ([Wordpress-admin](https://liikunta.content.api.hel.fi/wp-admin/wp-admin/))
 
 Note that the 1st production deployment from the monorepo will be done while connected toa temporary production server:

apps/sports-helsinki/package.json

@@ -79,7 +79,7 @@
     "react-datepicker": "^4.14.1",
     "react-dom": "18.2.0",
     "react-error-boundary": "4.0.10",
-    "react-helsinki-headless-cms": "1.0.0-alpha291",
+    "react-helsinki-headless-cms": "1.0.0-alpha292",
     "react-i18next": "13.0.1",
     "react-leaflet": "4.2.1",
     "react-scroll": "^1.8.9",

package.json

@@ -55,9 +55,9 @@
     "docker:sports:serve": "docker-compose -f docker-compose.sports.yml --env-file ./apps/sports-helsinki/.env.local up runner",
     "docker:events-graphql-proxy": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.events-graphql-proxy.yml --env-file ./proxies/events-graphql-proxy/.env up events-graphql-proxy",
     "docker:venue-graphql-proxy": "cross-env DOCKER_BUILDKIT=1 docker-compose -f docker-compose.venue-graphql-proxy.yml --env-file ./proxies/venue-graphql-proxy/.env up venue-graphql-proxy",
-    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.hkih.stage.geniem.io/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.hkih.stage.geniem.io/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.hkih.stage.geniem.io/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
+    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
+    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
+    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
     "docker:down": "docker-compose down",
     "docker:nuke-all": "npm-run-all --sequential --continue-on-error --print-label \"docker:nuke:*\"",
     "docker:nuke:images": "docker image rm -f $(docker image ls -q)",

packages/components/package.json

@@ -77,7 +77,7 @@
     "react-datepicker": "^4.14.1",
     "react-dom": "18.2.0",
     "react-error-boundary": "4.0.10",
-    "react-helsinki-headless-cms": "1.0.0-alpha291",
+    "react-helsinki-headless-cms": "1.0.0-alpha292",
     "react-i18next": "13.0.1",
     "react-leaflet": "4.2.1",
     "react-toastify": "^9.1.3",

proxies/events-graphql-federation/README.md

@@ -67,9 +67,9 @@ In the `package.json` of the root in the monorepo, there is a script that can be
 
 ```javascript
   "scripts": {
-    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.hkih.stage.geniem.io/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.hkih.stage.geniem.io/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
-    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.hkih.stage.geniem.io/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
+    "docker:graphql-router:hobbies:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://harrastus.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
+    "docker:graphql-router:events:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://tapahtumat.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
+    "docker:graphql-router:sports:serve": "cross-env FEDERATION_CMS_ROUTING_URL=https://liikunta.app-staging.hkih.hion.dev/graphql FEDERATION_EVENTS_ROUTING_URL=https://events-graphql-proxy.test.hel.ninja/proxy/graphql FEDERATION_UNIFIED_SEARCH_ROUTING_URL=https://kuva-unified-search.api.test.hel.ninja/search FEDERATION_VENUES_ROUTING_URL=https://venue-graphql-proxy.test.hel.ninja/proxy/graphql docker-compose -f docker-compose.router.yml up",
   }
 ```
 
@@ -114,21 +114,21 @@ More details about this pattern can be read from the Apollo documentation: [Subg
 To introspect a subgraph, use:
 
 ```sh
-rover subgraph introspect https://tapahtumat.hkih.stage.geniem.io/graphql
+rover subgraph introspect https://tapahtumat.app-staging.hkih.hion.dev/graphql
 ```
 
 > NOTE: If the graph is not a subgraph yet, it needs to be migrated to a subgraph. See: [Apollo Federation subgraph specification](https://www.apollographql.com/docs/federation/subgraph-spec/)
 
 To introspect an old monolith graph, use:
 
 ```sh
-rover graph introspect https://tapahtumat.hkih.stage.geniem.io/graphql
+rover graph introspect https://tapahtumat.app-staging.hkih.hion.dev/graphql
 ```
 
 or to export the result in a file:
 
 ```sh
-rover graph introspect https://tapahtumat.hkih.stage.geniem.io/graphql > my-schema.graphql
+rover graph introspect https://tapahtumat.app-staging.hkih.hion.dev/graphql > my-schema.graphql
 ```
 
 #### Work with supergraph

proxies/events-graphql-federation/subgraphs/cms/README.md

@@ -12,27 +12,27 @@ All the Graphql server instances which are hosted by Geniem, should be running t
 2. The graph does not provide a mechanism for subgraph developers to resolve entity fields via the `Query._entities` -field.
 3. Neither does it follow the federation v2 directives.
 
-The GraphQL schema is fetched with (_a graph command for monolith schemas_) `rover graph introspect https://tapahtumat.hkih.stage.geniem.io/graphql > subgraphs/cms/cms.graphql`.
+The GraphQL schema is fetched with (_a graph command for monolith schemas_) `rover graph introspect https://tapahtumat.app-staging.hkih.hion.dev/graphql > subgraphs/cms/cms.graphql`.
 
 The used routing URLs:
 
-- Events staging: https://tapahtumat.hkih.stage.geniem.io/graphql
+- Events staging: https://tapahtumat.app-staging.hkih.hion.dev/graphql
 - Events production: https://tapahtumat.content.api.hel.fi/graphql
-- Hobbies staging: https://harrastus.hkih.stage.geniem.io/graphql
+- Hobbies staging: https://harrastus.app-staging.hkih.hion.dev/graphql
 - Hobbies production: https://harrastus.content.api.hel.fi/graphql
-- Sports staging: https://liikunta.hkih.stage.geniem.io/graphql
+- Sports staging: https://liikunta.app-staging.hkih.hion.dev/graphql
 - Sports production: https://liikunta.content.api.hel.fi/graphql (NOTE: This Sports production server could still be in production use in the old deprecated Liikunta-app)
 
 An example of the supergraph config:
 
 ```
 subgraphs:
   cms:
-    routing_url: https://tapahtumat.hkih.stage.geniem.io/graphql
+    routing_url: https://tapahtumat.app-staging.hkih.hion.dev/graphql
     # routing_url: https://tapahtumat.content.api.hel.fi/graphql
-    # routing_url: https://harrastus.hkih.stage.geniem.io/graphql
+    # routing_url: https://harrastus.app-staging.hkih.hion.dev/graphql
     # routing_url: https://harrastus.content.api.hel.fi/graphql
-    # routing_url: https://liikunta.hkih.stage.geniem.io/graphql
+    # routing_url: https://liikunta.app-staging.hkih.hion.dev/graphql
     # routing_url: https://liikunta.content.api.hel.fi/graphql
     schema:
       file: ./subgraphs/cms/cms.graphql

proxies/events-graphql-federation/supergraph-config.yaml

@@ -1,11 +1,11 @@
 federation_version: 2
 subgraphs:
   cms:
-    routing_url: https://tapahtumat.hkih.stage.geniem.io/graphql
+    routing_url: https://tapahtumat.app-staging.hkih.hion.dev/graphql
     # routing_url: https://tapahtumat.content.api.hel.fi/graphql
-    # routing_url: https://harrastus.hkih.stage.geniem.io/graphql
+    # routing_url: https://harrastus.app-staging.hkih.hion.dev/graphql
     # routing_url: https://harrastus.content.api.hel.fi/graphql
-    # routing_url: https://liikunta.hkih.stage.geniem.io/graphql
+    # routing_url: https://liikunta.app-staging.hkih.hion.dev/graphql
     # routing_url: https://liikunta.content.api.hel.fi/graphql
     schema:
       file: ./subgraphs/cms/cms.graphql

proxies/events-graphql-federation/supergraph.graphql

@@ -5538,7 +5538,7 @@ type InternalIdObject
 scalar join__FieldSet
 
 enum join__Graph {
-  CMS @join__graph(name: "cms", url: "https://tapahtumat.hkih.stage.geniem.io/graphql")
+  CMS @join__graph(name: "cms", url: "https://tapahtumat.app-staging.hkih.hion.dev/graphql")
   EVENTS @join__graph(name: "events", url: "https://events-graphql-proxy.test.hel.ninja/proxy/graphql")
   UNIFIED_SEARCH @join__graph(name: "unified-search", url: "https://kuva-unified-search.api.test.hel.ninja/search")
   VENUES @join__graph(name: "venues", url: "https://venue-graphql-proxy.test.hel.ninja/proxy/graphql")

yarn.lock

@@ -3525,7 +3525,7 @@ __metadata:
     react-datepicker: "npm:^4.14.1"
     react-dom: "npm:18.2.0"
     react-error-boundary: "npm:4.0.10"
-    react-helsinki-headless-cms: "npm:1.0.0-alpha291"
+    react-helsinki-headless-cms: "npm:1.0.0-alpha292"
     react-i18next: "npm:13.0.1"
     react-leaflet: "npm:4.2.1"
     react-toastify: "npm:^9.1.3"
@@ -14316,7 +14316,7 @@ __metadata:
     react-datepicker: "npm:^4.14.1"
     react-dom: "npm:18.2.0"
     react-error-boundary: "npm:4.0.10"
-    react-helsinki-headless-cms: "npm:1.0.0-alpha291"
+    react-helsinki-headless-cms: "npm:1.0.0-alpha292"
     react-i18next: "npm:13.0.1"
     react-scroll: "npm:^1.8.9"
     react-toastify: "npm:^9.1.3"
@@ -16192,7 +16192,7 @@ __metadata:
     react-datepicker: "npm:^4.14.1"
     react-dom: "npm:18.2.0"
     react-error-boundary: "npm:4.0.10"
-    react-helsinki-headless-cms: "npm:1.0.0-alpha291"
+    react-helsinki-headless-cms: "npm:1.0.0-alpha292"
     react-i18next: "npm:13.0.1"
     react-scroll: "npm:^1.8.9"
     react-toastify: "npm:^9.1.3"
@@ -23273,9 +23273,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-helsinki-headless-cms@npm:1.0.0-alpha291":
-  version: 1.0.0-alpha291
-  resolution: "react-helsinki-headless-cms@npm:1.0.0-alpha291"
+"react-helsinki-headless-cms@npm:1.0.0-alpha292":
+  version: 1.0.0-alpha292
+  resolution: "react-helsinki-headless-cms@npm:1.0.0-alpha292"
   dependencies:
     hds-design-tokens: "npm:^3.9.0"
     html-entities: "npm:^2.4.0"
@@ -23292,7 +23292,7 @@ __metadata:
   peerDependenciesMeta:
     "@apollo/client":
       optional: true
-  checksum: 1fd335a299e8ac2ac5452e6bac15669190e0984d103810e4ba7f588180c013f51ba7d5b1fb31894868940ec9a085cecead809b12258b50ad77edce5952001031
+  checksum: 15ba62e9413edea20ac4761061bee9c6eaf1f7816d0a9223183b8a94562846efdcb9ee00e09552daa674b41b27892a9af4e38e054080ef608cf35e165d13cca2
   languageName: node
   linkType: hard
 
@@ -25352,7 +25352,7 @@ __metadata:
     react-datepicker: "npm:^4.14.1"
     react-dom: "npm:18.2.0"
     react-error-boundary: "npm:4.0.10"
-    react-helsinki-headless-cms: "npm:1.0.0-alpha291"
+    react-helsinki-headless-cms: "npm:1.0.0-alpha292"
     react-i18next: "npm:13.0.1"
     react-leaflet: "npm:4.2.1"
     react-scroll: "npm:^1.8.9"