048572946c
* v3.20.2...v3.24.0 * Fix handle undefined outlet in route component * Don't use template helper for optional modal.open Using the optional-helper here will trigger a computation in the same runloop error. This is because we are setting the `modal`-property when the `<Ref>` component gets rendered which will update the `this.modal`-property which will then recompute the `optional`-helper leading to this error. Instead we will create an action that will call the `open`-method on the modal when it is defined. This gets rid of the double computation error as we will not access the modal property twice in the same runloop when `modal` is getting set. * Fix - fn needs to be passed function tab-nav We create functions in the component file instead so that fn-helper stops complaining about the need to pass a function. * Update ember-exam to 6.1 version "Makes it compatible" with ember-qunit v5 * scheduleOnce setMaxHeight paged-collection We need to schedule to get around double-computation error. * Fix - model.data is removed from ember-data This has been private API all along - we need to work around the removal. Reference: https://github.com/emberjs/data/pull/7338/files#diff-9a8746fc5c86fd57e6122f00fef3155f76f0f3003a24b53fb7c4621d95dcd9bfL1310 * Fix `propContains` instead of `deepEqual` policy Recent model.data works differently than iterating attributes. We use `propContains` instead of `deepEqual`. We are only interested in the properties we assert against and match the previous behavior with this change. * Fix `propContains` instead of `deepEqual` token * Better handling single-records repo test-helper `model.data` has been removed we need to handle proxies and model instances differently. * Fix remaining repository tests with propContains We don't want to match entire objects - we don't care about properties we haven't defined in the assertion. * Don't use template helper for optional modal.open Using a template helper will give us a recomputation error - we work around it by creating an explicit action on the component instead. * Await `I $verb the $pageObject object` step * Fix no more customization ember-can No need to customize, the helper handles destruction fine on its own. * Fix - don't pass `optional` functions to fn We will declare the functions on the component instead. This gives us the same behavior but no error from `fn`, which expects a function to be passed. * Fix - handle `undefined` state on validate modifier StateChart can yield out an undefined `state` we need to handle that in the validate modifier * Fix linting errors tests directory * Warn / turn off new ember linting issues We will tackle them one by one and don't want to autofix issues that could be dangerous to auto-fix. * Auto-fix linting issues * More linting configuration * Fix remaining linting issues * Fix linting issues new files after rebase * ui: Remove ember-cli-uglify config now we are using terser (#14574) Co-authored-by: John Cowen <johncowen@users.noreply.github.com>
100 lines
3.5 KiB
JavaScript
100 lines
3.5 KiB
JavaScript
/* eslint no-control-regex: "off" */
|
|
import Yadda from 'yadda';
|
|
import YAML from 'js-yaml';
|
|
import { env } from '../env';
|
|
export default (utils) =>
|
|
(annotations, nspace, dict = new Yadda.Dictionary()) => {
|
|
dict
|
|
.define('pageObject', /(\S+)/, function (path, cb) {
|
|
const $el = utils.find(path);
|
|
cb(null, $el);
|
|
})
|
|
.define('model', /(\w+)/, function (model, cb) {
|
|
switch (model) {
|
|
case 'datacenter':
|
|
case 'datacenters':
|
|
case 'dcs':
|
|
model = 'dc';
|
|
break;
|
|
case 'services':
|
|
model = 'service';
|
|
break;
|
|
case 'nodes':
|
|
model = 'node';
|
|
break;
|
|
case 'kvs':
|
|
model = 'kv';
|
|
break;
|
|
case 'acls':
|
|
model = 'acl';
|
|
break;
|
|
case 'sessions':
|
|
model = 'session';
|
|
break;
|
|
case 'intentions':
|
|
model = 'intention';
|
|
break;
|
|
}
|
|
cb(null, model);
|
|
})
|
|
.define('number', /(\d+)/, Yadda.converters.integer)
|
|
.define('json', /([^\u0000]*)/, function (val, cb) {
|
|
// replace any instance of @namespace in the string
|
|
val = val.replace(
|
|
/@namespace/g,
|
|
typeof nspace === 'undefined' || nspace === '' ? 'default' : nspace
|
|
);
|
|
cb(null, JSON.parse(val));
|
|
})
|
|
.define('yaml', /([^\u0000]*)/, function (val, cb) {
|
|
// sometimes we need to always force a namespace queryParam
|
|
// mainly for DELETEs
|
|
if (env('CONSUL_NSPACES_ENABLED')) {
|
|
val = val.replace(/ns=@!namespace/g, `ns=${nspace || 'default'}`);
|
|
val = val.replace(/Namespace: @!namespace/g, `Namespace: ${nspace || 'default'}`);
|
|
} else {
|
|
val = val.replace(/&ns=@!namespace/g, '');
|
|
val = val.replace(/&ns=\*/g, '');
|
|
val = val.replace(/- \/v1\/namespaces/g, '');
|
|
val = val.replace(/Namespace: @!namespace/g, '');
|
|
}
|
|
if (typeof nspace === 'undefined' || nspace === '') {
|
|
val = val.replace(/Namespace: @namespace/g, '').replace(/&ns=@namespace/g, '');
|
|
}
|
|
// replace any other instance of @namespace in the string
|
|
val = val.replace(
|
|
/@namespace/g,
|
|
typeof nspace === 'undefined' || nspace === '' ? 'default' : nspace
|
|
);
|
|
cb(null, YAML.load(val));
|
|
})
|
|
.define('endpoint', /([^\u0000]*)/, function (val, cb) {
|
|
// if is @namespace is !important, always replace with namespace
|
|
// or if its undefined or empty then use default
|
|
if (env('CONSUL_NSPACES_ENABLED')) {
|
|
val = val.replace(/ns=@!namespace/g, `ns=${nspace || 'default'}`);
|
|
} else {
|
|
val = val.replace(/&ns=@!namespace/g, '');
|
|
val = val.replace(/&ns=\*/g, '');
|
|
}
|
|
// for endpoints if namespace isn't specified it should
|
|
// never add the ns= unless its !important...
|
|
if (typeof nspace !== 'undefined' && nspace !== '') {
|
|
val = val.replace(/ns=@namespace/g, `ns=${nspace}`);
|
|
} else {
|
|
val = val
|
|
.replace(/&ns=@namespace/g, '')
|
|
.replace(/ns=@namespace&/g, '')
|
|
.replace(/ns=@namespace/g, '');
|
|
}
|
|
cb(null, val);
|
|
});
|
|
if (typeof nspace !== 'undefined' && nspace !== '') {
|
|
dict.define('url', /([^\u0000]*)/, function (val, cb) {
|
|
val = `/~${nspace}${val}`;
|
|
cb(null, val);
|
|
});
|
|
}
|
|
return dict;
|
|
};
|