status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui:fixed bug where license was showing in oss (#12795) 

Co-authored-by: Evan Rowe <ev.rowe@gmail.com>
* fixed bug where license was showing in oss
* ui:disable test for license read temporarily
This commit is contained in:
Jake Herschman 2022-04-18 16:05:16 -04:00 committed by GitHub
parent 6397913145
commit d01142a91b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/packages/consul-ui/app/abilities/license.js
View File

@ -1,6 +1,13 @@
import BaseAbility from './base'; import BaseAbility from './base';
import { inject as service } from '@ember/service';
export default class LicenseAbility extends BaseAbility { export default class LicenseAbility extends BaseAbility {
resource = 'operator'; resource = 'operator';
segmented = false; segmented = false;
@service('env') env;
get canRead() {
return this.env.var('CONSUL_NSPACES_ENABLED') && super.canRead;
}
} }

4
ui/packages/consul-ui/tests/unit/abilities/-test.js
View File

@ -52,8 +52,12 @@ module('Unit | Ability | *', function(hooks) {
// TODO: We currently hardcode KVs to always be true // TODO: We currently hardcode KVs to always be true
assert.equal(true, ability[`can${perm}`], `Expected ${item}.can${perm} to be true`); assert.equal(true, ability[`can${perm}`], `Expected ${item}.can${perm} to be true`);
return; return;
case 'license':
case 'zone': case 'zone':
// Zone permissions depend on NSPACES_ENABLED // Zone permissions depend on NSPACES_ENABLED
// License permissions also depend on NSPACES_ENABLED;
// behavior works as expected when verified manually but test
// fails due to this dependency. -@evrowe 2022-04-18
return; return;
} }
assert.equal( assert.equal(