Merge pull request #139 from cloudblue/LITE-29057-show-product-version-in-dr

Hairash · web-flow · commit c6f23eb6f5d8 · 2024-02-13T12:27:56.000+01:00
LITE-29057 Output product version for Deployment Request
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cloudblueconnect/connect-extension-runner:29.4
+FROM cloudblueconnect/connect-extension-runner:30.0
 
 COPY pyproject.toml /install_temp/.
 COPY poetry.* /install_temp/.
diff --git a/connect_ext_ppr/service.py b/connect_ext_ppr/service.py
@@ -185,7 +185,7 @@ def create_ppr(ppr, user_id, deployment, db, client, logger):
     config_json = {}
     status = PPRVersion.STATUS.ready
     active_configuration = None
-    product_version = None
+    product_version = deployment.product.version
     if not file_data:
         active_configuration = (
             db.query(Configuration)
@@ -209,7 +209,6 @@ def create_ppr(ppr, user_id, deployment, db, client, logger):
             .first()
         )
         data = None
-        product_version = deployment.product.version
         product_info = (
             f"(product_id={deployment.product_id}, "
             f"product_version={deployment.product.version})"
diff --git a/connect_ext_ppr/static/index.8907dee66ebdfb4a3a16.js b/connect_ext_ppr/static/index.8907dee66ebdfb4a3a16.js
diff --git a/connect_ext_ppr/static/index.html b/connect_ext_ppr/static/index.html
@@ -12,7 +12,7 @@
     <link href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap" rel="stylesheet">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <title>Index</title>
-<script defer src="vendors.d43ac28a3eb5fa40c6ce.js"></script><script defer src="index.be01a9ee781833b05409.js"></script><link href="index.078542b7141079d77ac1.css" rel="stylesheet"></head>
+<script defer src="vendors.d43ac28a3eb5fa40c6ce.js"></script><script defer src="index.8907dee66ebdfb4a3a16.js"></script><link href="index.078542b7141079d77ac1.css" rel="stylesheet"></head>
 
 <body>
     <div id="app"></div>
diff --git a/connect_ext_ppr/static/request-details.52f77cb9d466174a428e.js b/connect_ext_ppr/static/request-details.52f77cb9d466174a428e.js
diff --git a/connect_ext_ppr/utils.py b/connect_ext_ppr/utils.py
@@ -242,12 +242,10 @@ def get_deployment_reference_schema(deployment, hub):
 
 def get_deployment_request_schema(deployment_request, hub):
     """
-    Returns DeploymentSchema for the deployment
-    :param deployment: Deployment model
-    :param product: Product model from Connect
-    :param vendor: Vendor Account model from Connect
+    Returns DeploymentRequestSchema for the deployment request
+    :param deployment_request: DeploymentRequest model
     :param hub: Hub model from Connect
-    :rtype: DeploymentSchema
+    :rtype: DeploymentRequestSchema
     """
     ppr = deployment_request.ppr
     ppr_schema = PPRVersionReferenceSchema(
diff --git a/tests/api/test_pprs.py b/tests/api/test_pprs.py
@@ -318,6 +318,7 @@ def test_upload_ppr(
         },
         'description': '\n**Description**\nWhat a lovely day\n\n\n',
         'status': 'ready',
+        'product_version': 3,
     }
     assert id[:6] == 'PPRFL-'
     assert isinstance(events['created']['at'], str)
@@ -382,6 +383,7 @@ def test_upload_ppr_invalid(
             "does not contain items matching the given schema\n\n"
         ),
         'status': 'failed',
+        'product_version': 3,
     }
     assert id[:6] == 'PPRFL-'
     assert isinstance(events['created']['at'], str)
@@ -444,6 +446,7 @@ def test_post_ppr_new_version(
         },
         'description': '\n**Description**\nWhat a lovely day\n\n\n',
         'status': 'ready',
+        'product_version': 3,
     }
     assert id[:6] == 'PPRFL-'
     assert isinstance(events['created']['at'], str)
diff --git a/ui/src/pages/RequestDetails.vue b/ui/src/pages/RequestDetails.vue
@@ -59,7 +59,7 @@ c-view.request-details(
       )
         template(#value="")
           detail-item(
-            :body-text="request.deployment?.product?.name",
+            :body-text="`${request.deployment?.product?.name} (version ${productVersion})`",
             dense,
           )
             template(#image="")
@@ -184,6 +184,7 @@ export default {
     currentTab: null,
     loading: true,
     request: null,
+    productVersion: null,
     isAbortingRequest: false,
     isRetryingRequest: false,
     areTasksUpdating: false,
@@ -231,6 +232,7 @@ export default {
     async getPprFileUrl() {
       const ppr = await getPPR(this.request.deployment.id, this.request.ppr.id);
       this.pprFileUrl = ppr.file.location;
+      this.productVersion = ppr.product_version;
     },
 
     downloadPPR() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM cloudblueconnect/connect-extension-runner:29.4`
	`1`	`+FROM cloudblueconnect/connect-extension-runner:30.0`
`2`	`2`
`3`	`3`	`COPY pyproject.toml /install_temp/.`
`4`	`4`	`COPY poetry.* /install_temp/.`