Merge pull request #183 from Axinom/releases/iteration-82-merge

[AB#41507] release: iteration 82
Axinom · Oct 20, 2023 · cc59a94 · cc59a94
2 parents f05cca8 + aead94d
commit cc59a94
Show file tree

Hide file tree

Showing 17 changed files with 172 additions and 99 deletions.
diff --git a/README.md b/README.md
@@ -194,6 +194,17 @@ like:
 You can find these keys and values usually in the `.env.template` file of the
 workflow.
 
+#### Unpublishing a workflow package
+
+If you want to unpublish a previously published workflow package from the Mosaic
+Micro Frontend Service, the following CLI command provided by the Mosaic CLI can
+be used. The Service Account used to create the `api-key` must have
+`Pilets: Delete` permission assigned.
+
+```sh
+yarn mosaic unpublish-pilet -t {tenantId} -e {environmentId} -a {api-key} -n {pilet-name} -m {micro-frontend-service-base-url}
+```
+
 ## Deploying the services via Mosaic Hosting Service
 
 If you're looking for a quick way to deploy a service in the Axinom Cloud, we

diff --git a/libs/media-messages/package.json b/libs/media-messages/package.json
@@ -21,8 +21,8 @@
     "build:compile": "tsc"
   },
   "devDependencies": {
-    "@axinom/mosaic-cli": "0.22.1",
-    "@axinom/mosaic-message-bus-abstractions": "0.5.9",
+    "@axinom/mosaic-cli": "0.23.0",
+    "@axinom/mosaic-message-bus-abstractions": "0.5.10",
     "@types/glob": "^7.2.0",
     "concurrently": "^5.3.0",
     "rimraf": "^3.0.2",

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "yarn:de-dupe": "npx yarn-deduplicate yarn.lock"
   },
   "devDependencies": {
-    "@axinom/mosaic-cli": "0.22.1",
+    "@axinom/mosaic-cli": "0.23.0",
     "@dbeining/react-atom": "^4.1.21",
     "@jest/globals": "^29.1.2",
     "@libre/atom": "^1.3.3",

diff --git a/services/catalog/service/package.json b/services/catalog/service/package.json
@@ -41,11 +41,11 @@
     "util:define-func-migration": "yarn mosaic generate-define-func-migration"
   },
   "dependencies": {
-    "@axinom/mosaic-db-common": "0.26.0",
-    "@axinom/mosaic-message-bus": "0.16.0",
-    "@axinom/mosaic-message-bus-abstractions": "0.5.9",
-    "@axinom/mosaic-service-common": "0.38.0",
-    "@axinom/mosaic-graphql-common": "0.2.0",
+    "@axinom/mosaic-db-common": "0.27.0",
+    "@axinom/mosaic-message-bus": "0.17.0",
+    "@axinom/mosaic-message-bus-abstractions": "0.5.10",
+    "@axinom/mosaic-service-common": "0.39.0",
+    "@axinom/mosaic-graphql-common": "0.3.0",
     "@graphile-contrib/pg-simplify-inflector": "^6.1.0",
     "add": "^2.0.6",
     "amqplib": "^0.6.0",

diff --git a/services/catalog/service/src/index.ts b/services/catalog/service/src/index.ts
@@ -14,12 +14,14 @@ import {
 import {
   closeHttpServer,
   handleGlobalErrors,
+  isServiceAvailable,
   Logger,
   MosaicErrors,
   setupGlobalConsoleOverride,
   setupGlobalLogMiddleware,
   setupLivenessAndReadiness,
   setupMonitoring,
+  setupServiceHealthEndpoint,
   setupShutdownActions,
   tenantEnvironmentIdsLogMiddleware,
 } from '@axinom/mosaic-service-common';
@@ -41,6 +43,16 @@ async function bootstrap(): Promise<void> {
 
   const { readiness } = setupLivenessAndReadiness(config);
 
+  // Check ID service is available
+  if (!(await isServiceAvailable(config.idServiceAuthBaseUrl))) {
+    throw new Error(
+      'The Mosaic Identity Service is required to run this service, but it was not available.',
+    );
+  }
+
+  // Register service health endpoint
+  setupServiceHealthEndpoint(app);
+
   await applyMigrations(config);
   const shutdownActions = setupShutdownActions(app, logger);
   setupOwnerPgPool(

diff --git a/services/entitlement/service/package.json b/services/entitlement/service/package.json
@@ -46,13 +46,13 @@
     "util:define-func-migration": "yarn mosaic generate-define-func-migration"
   },
   "dependencies": {
-    "@axinom/mosaic-db-common": "0.26.0",
-    "@axinom/mosaic-id-guard": "0.21.1",
-    "@axinom/mosaic-id-utils": "0.15.6",
-    "@axinom/mosaic-message-bus": "0.16.0",
-    "@axinom/mosaic-messages": "0.32.1",
-    "@axinom/mosaic-service-common": "0.38.0",
-    "@axinom/mosaic-graphql-common": "0.2.0",
+    "@axinom/mosaic-db-common": "0.27.0",
+    "@axinom/mosaic-id-guard": "0.22.0",
+    "@axinom/mosaic-id-utils": "0.15.7",
+    "@axinom/mosaic-message-bus": "0.17.0",
+    "@axinom/mosaic-messages": "0.33.0",
+    "@axinom/mosaic-service-common": "0.39.0",
+    "@axinom/mosaic-graphql-common": "0.3.0",
     "ajv": "^7.2.4",
     "ajv-formats": "^1.6.1",
     "@graphile-contrib/pg-simplify-inflector": "^6.1.0",

diff --git a/services/entitlement/service/src/index.ts b/services/entitlement/service/src/index.ts
@@ -17,13 +17,15 @@ import {
 import {
   closeHttpServer,
   handleGlobalErrors,
+  isServiceAvailable,
   Logger,
   MosaicErrors,
   setupGlobalConsoleOverride,
   setupGlobalLogMiddleware,
   setupGlobalSkipMaskMiddleware,
   setupLivenessAndReadiness,
   setupMonitoring,
+  setupServiceHealthEndpoint,
   setupShutdownActions,
   tenantEnvironmentIdsLogMiddleware,
   trimErrorsSkipMaskMiddleware,
@@ -56,6 +58,16 @@ async function bootstrap(): Promise<void> {
 
   const { readiness } = setupLivenessAndReadiness(config);
 
+  // Check ID service is available
+  if (!(await isServiceAvailable(config.idServiceAuthBaseUrl))) {
+    throw new Error(
+      'The Mosaic Identity Service is required to run this service, but it was not available.',
+    );
+  }
+
+  // Register service health endpoint
+  setupServiceHealthEndpoint(app);
+
   await applyMigrations(config);
 
   const shutdownActions = setupShutdownActions(app, logger);

diff --git a/services/media/service/package.json b/services/media/service/package.json
@@ -46,14 +46,14 @@
     "util:define-func-migration": "yarn mosaic generate-define-func-migration"
   },
   "dependencies": {
-    "@axinom/mosaic-db-common": "0.26.0",
-    "@axinom/mosaic-id-guard": "0.21.1",
-    "@axinom/mosaic-id-link-be": "0.13.7",
-    "@axinom/mosaic-message-bus": "0.16.0",
-    "@axinom/mosaic-message-bus-abstractions": "0.5.9",
-    "@axinom/mosaic-messages": "0.32.1",
-    "@axinom/mosaic-service-common": "0.38.0",
-    "@axinom/mosaic-graphql-common": "0.2.0",
+    "@axinom/mosaic-db-common": "0.27.0",
+    "@axinom/mosaic-id-guard": "0.22.0",
+    "@axinom/mosaic-id-link-be": "0.13.8",
+    "@axinom/mosaic-message-bus": "0.17.0",
+    "@axinom/mosaic-message-bus-abstractions": "0.5.10",
+    "@axinom/mosaic-messages": "0.33.0",
+    "@axinom/mosaic-service-common": "0.39.0",
+    "@axinom/mosaic-graphql-common": "0.3.0",
     "@faker-js/faker": "^7.5.0",
     "@graphile-contrib/pg-simplify-inflector": "^6.1.0",
     "ajv": "^7.2.4",

diff --git a/services/media/service/src/index.ts b/services/media/service/src/index.ts
@@ -13,6 +13,7 @@ import { CreateRabbitMQConnectivityMetric } from '@axinom/mosaic-message-bus';
 import {
   closeHttpServer,
   handleGlobalErrors,
+  isServiceAvailable,
   Logger,
   MosaicErrors,
   setupGlobalConsoleOverride,
@@ -21,6 +22,7 @@ import {
   setupHttpServerWithWebsockets,
   setupLivenessAndReadiness,
   setupMonitoring,
+  setupServiceHealthEndpoint,
   setupShutdownActions,
   tenantEnvironmentIdsLogMiddleware,
   trimErrorsSkipMaskMiddleware,
@@ -70,6 +72,16 @@ async function bootstrap(): Promise<void> {
   // Set up liveness and readiness probe endpoints for Kubernetes.
   const { readiness } = setupLivenessAndReadiness(config);
 
+  // Check ID service is available
+  if (!(await isServiceAvailable(config.idServiceAuthBaseUrl))) {
+    throw new Error(
+      'The Mosaic Identity Service is required to run this service, but it was not available.',
+    );
+  }
+
+  // Register service health endpoint
+  setupServiceHealthEndpoint(app);
+
   // Enable multipart request support for GQL to support file upload.
   app.use(graphqlUploadExpress());
   // Run database migrations to the latest committed state.

diff --git a/services/media/workflows/package.json b/services/media/workflows/package.json
@@ -27,8 +27,8 @@
   ],
   "dependencies": {
     "@apollo/client": "^3.7.9",
-    "@axinom/mosaic-managed-workflow-integration": "0.4.0",
-    "@axinom/mosaic-ui": "0.36.1",
+    "@axinom/mosaic-managed-workflow-integration": "0.5.0",
+    "@axinom/mosaic-ui": "0.37.0",
     "apollo-upload-client": "^14.1.3",
     "clsx": "^1.2.1",
     "env-cmd": "^10.1.0",
@@ -39,7 +39,7 @@
     "yup": "^0.32.11"
   },
   "devDependencies": {
-    "@axinom/mosaic-portal": "0.20.0",
+    "@axinom/mosaic-portal": "0.21.0",
     "@dbeining/react-atom": "^4.1.21",
     "@graphql-codegen/cli": "^2.13.4",
     "@graphql-codegen/typescript": "^2.7.3",

diff --git a/services/media/workflows/src/Stations/Movies/MovieGenres/MovieGenres.module.scss b/services/media/workflows/src/Stations/Movies/MovieGenres/MovieGenres.module.scss
@@ -1,4 +1,9 @@
 .datalist {
   display: grid;
   grid-template-columns: 1fr 100px;
+
+  .rightAlignment
+  {
+    text-align: right;
+  }
 }
diff --git a/services/media/workflows/src/Stations/Movies/MovieGenres/MovieGenres.tsx b/services/media/workflows/src/Stations/Movies/MovieGenres/MovieGenres.tsx
@@ -137,7 +137,9 @@ const Panel: React.FC<{ data?: MovieGenresQuery }> = ({ data }) => {
           <Paragraph title="Statistic">
             <div className={classes.datalist}>
               <div>Items Total</div>
-              <div>{data?.movieGenres?.totalCount}</div>
+              <div className={classes.rightAlignment}>
+                {data?.movieGenres?.totalCount}
+              </div>
             </div>
           </Paragraph>
           <Paragraph title="Publishing Status">

diff --git a/services/media/workflows/src/Stations/TvShows/TvShowGenres/TvShowGenres.module.scss b/services/media/workflows/src/Stations/TvShows/TvShowGenres/TvShowGenres.module.scss
@@ -1,4 +1,9 @@
 .datalist {
   display: grid;
   grid-template-columns: 1fr 100px;
+
+  .rightAlignment
+  {
+    text-align: right;
+  }
 }
diff --git a/services/media/workflows/src/Stations/TvShows/TvShowGenres/TvShowGenres.tsx b/services/media/workflows/src/Stations/TvShows/TvShowGenres/TvShowGenres.tsx
@@ -135,7 +135,9 @@ const Panel: React.FC<{ data?: TvShowGenresQuery }> = ({ data }) => {
           <Paragraph title="Statistic">
             <div className={classes.datalist}>
               <div>Items Total</div>
-              <div>{data?.tvshowGenres?.totalCount}</div>
+              <div className={classes.rightAlignment}>
+                {data?.tvshowGenres?.totalCount}
+              </div>
             </div>
           </Paragraph>
           <Paragraph title="Publishing Status">

diff --git a/services/vod-to-live/service/package.json b/services/vod-to-live/service/package.json
@@ -28,10 +28,10 @@
     "setup:webhook": "yarn util:load-vars ts-node --files scripts/setup-webhook.ts"
   },
   "dependencies": {
-    "@axinom/mosaic-id-guard": "0.21.1",
-    "@axinom/mosaic-message-bus": "0.16.0",
-    "@axinom/mosaic-messages": "0.32.1",
-    "@axinom/mosaic-service-common": "0.38.0",
+    "@axinom/mosaic-id-guard": "0.22.0",
+    "@axinom/mosaic-message-bus": "0.17.0",
+    "@axinom/mosaic-messages": "0.33.0",
+    "@axinom/mosaic-service-common": "0.39.0",
     "@azure/storage-blob": "^12.12.0",
     "amqplib": "^0.6.0",
     "axios": "^0.24.0",

diff --git a/services/vod-to-live/service/src/index.ts b/services/vod-to-live/service/src/index.ts
@@ -6,13 +6,15 @@ import {
 import {
   closeHttpServer,
   handleGlobalErrors,
+  isServiceAvailable,
   Logger,
   MosaicErrors,
   setupGlobalConsoleOverride,
   setupGlobalLogMiddleware,
   setupGlobalSkipMaskMiddleware,
   setupLivenessAndReadiness,
   setupMonitoring,
+  setupServiceHealthEndpoint,
   setupShutdownActions,
   tenantEnvironmentIdsLogMiddleware,
   trimErrorsSkipMaskMiddleware,
@@ -41,6 +43,16 @@ async function bootstrap(): Promise<void> {
 
   const { readiness } = setupLivenessAndReadiness(config);
 
+  // Check ID service is available
+  if (!(await isServiceAvailable(config.idServiceAuthBaseUrl))) {
+    throw new Error(
+      'The Mosaic Identity Service is required to run this service, but it was not available.',
+    );
+  }
+
+  // Register service health endpoint
+  setupServiceHealthEndpoint(app);
+
   const shutdownActions = setupShutdownActions(app, logger);
 
   const storage = new AzureStorage(