Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Control/lib/common/kvStore/runtime.enum.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
const RUNTIME_COMPONENT = Object.freeze({
PDP_VERSION: 'aliecs/defaults',
COG: 'COG',
COG_V1: 'COG_V1',
COG_V1: 'COG-v1',
});

/**
Expand Down
2 changes: 1 addition & 1 deletion Control/lib/kafka/enums/consumerGroups.enum.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ exports.ConsumerGroups = Object.freeze({
ENVIRONMENT: 'cog-environment',
INTEGRATED_SERVICE: {
DCS: 'cog-dcs-integrated-service',
ODC: 'cog-odc-integrated-service'
ODC: 'cog-odc-integrated-service',
},
RUN: 'cog-run',
TASK: 'cog-task',
Expand Down
4 changes: 2 additions & 2 deletions Control/package-lock.json

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aliceo2/control",
"version": "1.80.0",
"version": "2.0.0",
"description": "ALICE O2 Control GUI",
"author": "George Raduta",
"contributors": [
Expand Down
5 changes: 3 additions & 2 deletions Control/public/environment/Environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,10 @@ export default class Environment extends Observable {
this.itemNew = RemoteData.failure(result.message);
this.notify();
} else {
const { id } = result;
this.itemNew = RemoteData.notAsked();
this.model.router.go(`?page=environment&id=${id}`);
// Users cannot be redirected to specific environment as it does not exist in
// ECS until it becomes active, thus users would get a NotFound reply from ECS
this.model.router.go(`?page=environments`);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Control/test/public/page-new-environment-mocha.js
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ describe('`pageNewEnvironment` test-suite', async () => {
waitUntil: 'networkidle0',
});
const location = await page.evaluate(() => window.location);
assert.strictEqual(location.search, '?page=environment&id=6f6d6387-6577-11e8-993a-f07959157220&panel=general');
assert.strictEqual(location.search, '?page=environments');
assert.ok(calls['newEnvironmentAsync']);
});

Expand Down