Skip to content

Repository navigation

[release/cog/2.0.1] #3035

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
graduta merged 8 commits into from
Sep 3, 2025
Merged

[release/cog/2.0.1] #3035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bfdb145
Redirect user to all envs rather than single one
graduta Sep 3, 2025
9711828
Bump COG
graduta Sep 3, 2025
8f3de2f
Revert local dev change
graduta Sep 3, 2025
6d742fe
Fix lint and test of front-end redirection
graduta Sep 3, 2025
b367a05
Keep environments in cache until acknowledged
graduta Sep 3, 2025
5874eff
Patch ECS GUI
graduta Sep 3, 2025
b62d90f
Remove local changes
graduta Sep 3, 2025
cd9871d
Merge branch 'dev' of github.com:AliceO2Group/WebUi into release/COG/…
graduta Sep 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
4 changes: 0 additions & 4 deletions Control/lib/services/Environment.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ class EnvironmentService {
throw grpcErrorToNativeError(error);
}
try {
if (!environments || environments.length === 0) {
this._broadcastService.broadcast(ENVIRONMENTS_OVERVIEW, []);
return [];
}
const activeEnvironmentList = [];
for (const { id } of environments) {
let environment;
Expand Down
7 changes: 5 additions & 2 deletions Control/lib/services/environment/EnvironmentCache.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,17 @@ class EnvironmentCacheService {
if (!cachedEnvironment.rootRole) {
cachedEnvironment.rootRole = environmentEvent.workflowTemplateInfoName;
}
this._environments.set(id, cachedEnvironment);

this.addOrUpdateEnvironment(cachedEnvironment, false);

if (
transition?.name === EnvironmentTransitionType.DESTROY &&
state === EnvironmentState.DONE &&
message === ECS_DESTROY_TRANSITION_DONE_MESSAGE
message === ECS_DESTROY_TRANSITION_DONE_MESSAGE &&
!cachedEnvironment.deploymentError
) {
// That is, if the environment successfully ended the DESTROY transition
// while not having a deployment error
this.removeEnvironmentById(id);
}

Expand Down
4 changes: 2 additions & 2 deletions Control/package-lock.json
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 Control/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aliceo2/control",
"version": "2.0.0",
"version": "2.0.1",
"description": "ALICE O2 Control GUI",
"author": "George Raduta",
"contributors": [
Expand Down