Skip to content

LITE-29057 Output product version for Deployment Request #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2024
Merged

LITE-29057 Output product version for Deployment Request #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/.
Expand Down
3 changes: 1 addition & 2 deletions connect_ext_ppr/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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})"
Expand Down
2 changes: 1 addition & 1 deletion ..._ppr/static/index.be01a9ee781833b05409.js → ..._ppr/static/index.8907dee66ebdfb4a3a16.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion connect_ext_ppr/static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...c/request-details.d2e1e1181d6531e0ff8b.js → ...c/request-details.52f77cb9d466174a428e.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions connect_ext_ppr/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just fixed the wrong description passing by

:param deployment_request: DeploymentRequest model
:param hub: Hub model from Connect
:rtype: DeploymentSchema
:rtype: DeploymentRequestSchema
"""
ppr = deployment_request.ppr
ppr_schema = PPRVersionReferenceSchema(
Expand Down
3 changes: 3 additions & 0 deletions tests/api/test_pprs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion ui/src/pages/RequestDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="")
Expand Down Expand Up @@ -184,6 +184,7 @@ export default {
currentTab: null,
loading: true,
request: null,
productVersion: null,
isAbortingRequest: false,
isRetryingRequest: false,
areTasksUpdating: false,
Expand Down Expand Up @@ -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() {
Expand Down