Skip to content
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.

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

feat: Locking and Deployment information changes #276

Merged
merged 49 commits into from
Feb 3, 2025
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
9fb2c5c
added get user object using github_id in jwt
TurkerKoc Jan 26, 2025
8be6b03
changed get username to get user object
TurkerKoc Jan 26, 2025
9ffdcfc
openapi update
TurkerKoc Jan 26, 2025
6d2b3de
added user avatar to the environment list
TurkerKoc Jan 26, 2025
b6aa222
added user avatar in activity history page
TurkerKoc Jan 26, 2025
f419c82
deployment state tag update
TurkerKoc Jan 26, 2025
fa18c91
Environment list view navigate to locking user github profile
TurkerKoc Jan 26, 2025
54ad1bd
change comment
TurkerKoc Jan 26, 2025
1c5a89e
linter fix
TurkerKoc Jan 26, 2025
18af68e
activity history with user github profile link
TurkerKoc Jan 26, 2025
a833409
changed environment list user check with keycloak
TurkerKoc Jan 26, 2025
c4064fd
fix deployment status tag
TurkerKoc Jan 26, 2025
b0d46f9
generalize time since locked and generalize it with UI updates
TurkerKoc Jan 26, 2025
4a21e92
latest deployment information in environment list
TurkerKoc Jan 27, 2025
7914e4d
last deployment date format changed
TurkerKoc Jan 27, 2025
ec7e57d
added creator of deployment information
TurkerKoc Jan 27, 2025
feddd97
fix deploy button not showed
TurkerKoc Jan 27, 2025
25a0991
showin who triggered last deployment
TurkerKoc Jan 27, 2025
d8065d2
deployment info tag updated
TurkerKoc Jan 28, 2025
8ab5a8b
Merge branch 'main' into feat/locking-deployment-info
TurkerKoc Jan 28, 2025
e959253
removed unecessary unit test for small component
TurkerKoc Jan 28, 2025
4191fc6
last deployment info ui alignment
TurkerKoc Jan 28, 2025
861c9fa
vscode extension recommendations
TurkerKoc Jan 30, 2025
43b4810
Using HeliosDeployment and Deployment entities together for immediate…
TurkerKoc Jan 30, 2025
34ff4e4
github deployment sync bug fix
TurkerKoc Jan 31, 2025
a0e5d92
convert helios deployments to locking user
TurkerKoc Jan 31, 2025
1507a7d
openapi
TurkerKoc Jan 31, 2025
217096b
activity history with immediate latest deployment information
TurkerKoc Jan 31, 2025
6e8a118
openapi
TurkerKoc Jan 31, 2025
cfbc091
Merge branch 'main' into feat/locking-deployment-info
TurkerKoc Feb 1, 2025
b88b4b1
openapi and some comments removed
TurkerKoc Feb 1, 2025
725500f
added migration script
TurkerKoc Feb 2, 2025
55715c8
checkstyle fix
TurkerKoc Feb 2, 2025
818808c
deployment status tag updated and state matching moved to HeliosDeplo…
TurkerKoc Feb 2, 2025
190a711
generalized user avatar component
TurkerKoc Feb 2, 2025
6f6ce5d
workflowrun helios deployment matching bug fix
TurkerKoc Feb 2, 2025
ebc0a87
review fix
TurkerKoc Feb 2, 2025
d6de889
client side clean up
TurkerKoc Feb 2, 2025
e8eff9e
server side review clean up
TurkerKoc Feb 2, 2025
7f60572
server side review clean up and updates
TurkerKoc Feb 2, 2025
c48f944
workflow run helios deployment sync
TurkerKoc Feb 2, 2025
0e63331
latest deployment information changed to createdAt
TurkerKoc Feb 2, 2025
4aa1be3
Merge remote-tracking branch 'origin/main' into feat/locking-deployme…
TurkerKoc Feb 2, 2025
0f27130
do not set user in deployment if already set
TurkerKoc Feb 2, 2025
8b44b98
Merge remote-tracking branch 'origin/main' into feat/locking-deployme…
TurkerKoc Feb 2, 2025
9277949
environment list view ui changes
TurkerKoc Feb 2, 2025
bbb76e4
environment-list view layout
TurkerKoc Feb 3, 2025
c25b510
expanded environment list view ui update
TurkerKoc Feb 3, 2025
a070ec6
comment deleted
TurkerKoc Feb 3, 2025
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
Prev Previous commit
Next Next commit
deployment status tag updated and state matching moved to HeliosDeplo…
…yment
TurkerKoc committed Feb 2, 2025
commit 818808c11049b8b3d895305898856ae424fd28b2
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@

@case ('PENDING') {
<!-- Pending State -->
<p-tag severity="info" [rounded]="true" [pTooltip]="'Deployment pending'">
<p-tag severity="warn" [rounded]="true" [pTooltip]="'Deployment pending'">
<i-tabler name="progress" class="!size-5 animate-spin"></i-tabler>
</p-tag>
}
Original file line number Diff line number Diff line change
@@ -64,23 +64,14 @@ public Deployment.State getState() {
if (isRealDeployment()) {
return realDeployment.getState();
} else if (isHeliosDeployment()) {
return mapHeliosStatusToDeploymentState(heliosDeployment.getStatus());
Deployment.State state =
HeliosDeployment.mapHeliosStatusToDeploymentState(heliosDeployment.getStatus());
return state;
} else {
return null;
}
}

private static Deployment.State mapHeliosStatusToDeploymentState(
HeliosDeployment.Status heliosStatus) {
return switch (heliosStatus) {
case WAITING, QUEUED -> Deployment.State.PENDING;
case IN_PROGRESS -> Deployment.State.IN_PROGRESS;
case DEPLOYMENT_SUCCESS -> Deployment.State.SUCCESS;
case FAILED -> Deployment.State.FAILURE;
case IO_ERROR, UNKNOWN -> Deployment.State.UNKNOWN;
};
}

public String getStatusesUrl() {
if (isRealDeployment()) {
return realDeployment.getStatusesUrl();
Original file line number Diff line number Diff line change
@@ -200,6 +200,8 @@ private void updateHeliosDeployment(Deployment deployment, Environment environme
// Only update if it isn't already set
if (heliosDeployment.getDeploymentId() == null) {
heliosDeployment.setDeploymentId(deployment.getId());
heliosDeployment.setStatus(
HeliosDeployment.mapDeploymentStateToHeliosStatus(deployment.getState()));
heliosDeploymentRepository.save(heliosDeployment);
log.info("Helios Deployment updated");
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.tum.cit.aet.helios.heliosdeployment;

import de.tum.cit.aet.helios.deployment.Deployment;
import de.tum.cit.aet.helios.environment.Environment;
import de.tum.cit.aet.helios.user.User;
import jakarta.persistence.Column;
@@ -135,4 +136,27 @@ public static HeliosDeployment.Status mapWorkflowRunStatus(
return Status.UNKNOWN;
}
}

public static Deployment.State mapHeliosStatusToDeploymentState(
HeliosDeployment.Status heliosStatus) {
return switch (heliosStatus) {
case WAITING -> Deployment.State.WAITING;
case QUEUED -> Deployment.State.PENDING;
case IN_PROGRESS -> Deployment.State.IN_PROGRESS;
case DEPLOYMENT_SUCCESS -> Deployment.State.SUCCESS;
case FAILED -> Deployment.State.FAILURE;
case IO_ERROR, UNKNOWN -> Deployment.State.UNKNOWN;
};
}

public static HeliosDeployment.Status mapDeploymentStateToHeliosStatus(Deployment.State state) {
return switch (state) {
case WAITING, PENDING -> Status.WAITING;
case IN_PROGRESS -> Status.IN_PROGRESS;
case SUCCESS -> Status.DEPLOYMENT_SUCCESS;
case FAILURE, ERROR -> Status.FAILED;
case UNKNOWN, INACTIVE -> Status.UNKNOWN;
case QUEUED -> Status.QUEUED;
};
}
}