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

UI: Remove Wizard #19220

Merged
merged 6 commits into from
Feb 16, 2023
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
3 changes: 3 additions & 0 deletions changelog/19220.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
ui: remove wizard
```
13 changes: 1 addition & 12 deletions ui/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,7 @@ export default class App extends Application {
},
replication: {
dependencies: {
services: [
'auth',
'flash-messages',
'namespace',
'replication-mode',
'router',
'store',
'version',
'wizard',
],
services: ['auth', 'flash-messages', 'namespace', 'replication-mode', 'router', 'store', 'version'],
externalRoutes: {
replication: 'vault.cluster.replication.index',
},
Expand All @@ -41,7 +32,6 @@ export default class App extends Application {
'router',
'store',
'version',
'wizard',
'secret-mount-path',
],
externalRoutes: {
Expand Down Expand Up @@ -69,7 +59,6 @@ export default class App extends Application {
'secret-mount-path',
'store',
'version',
'wizard',
],
externalRoutes: {
secrets: 'vault.cluster.secrets.backends',
Expand Down
4 changes: 0 additions & 4 deletions ui/app/components/auth-config-form/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const AuthConfigBase = Component.extend({

flashMessages: service(),
router: service(),
wizard: service(),
saveModel: task(
waitFor(function* () {
try {
Expand All @@ -36,9 +35,6 @@ const AuthConfigBase = Component.extend({
}
return;
}
if (this.wizard.currentMachine === 'authentication' && this.wizard.featureState === 'config') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE');
}
this.router.transitionTo('vault.cluster.access.methods').followRedirects();
this.flashMessages.success('The configuration was saved successfully.');
})
Expand Down
4 changes: 0 additions & 4 deletions ui/app/components/auth-config-form/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { waitFor } from '@ember/test-waiters';
export default AuthConfigComponent.extend({
flashMessages: service(),
router: service(),
wizard: service(),

saveModel: task(
waitFor(function* () {
Expand Down Expand Up @@ -49,9 +48,6 @@ export default AuthConfigComponent.extend({
}
return;
}
if (this.wizard.currentMachine === 'authentication' && this.wizard.featureState === 'config') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE');
}
this.router.transitionTo('vault.cluster.access.methods').followRedirects();
this.flashMessages.success('The configuration was saved successfully.');
})
Expand Down
6 changes: 0 additions & 6 deletions ui/app/components/auth-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { tracked } from '@glimmer/tracking';
*/
export default class AuthInfoComponent extends Component {
@service auth;
@service wizard;
@service router;

@tracked fakeRenew = false;
Expand All @@ -36,11 +35,6 @@ export default class AuthInfoComponent extends Component {
this.router.transitionTo(...arguments);
}

@action
restartGuide() {
this.wizard.restartGuide();
}

@action
renewToken() {
this.fakeRenew = true;
Expand Down
8 changes: 0 additions & 8 deletions ui/app/components/database-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,13 @@ export default class DatabaseConnectionEdit extends Component {
@service store;
@service router;
@service flashMessages;
@service wizard;

@tracked
showPasswordField = false; // used for edit mode

@tracked
showSaveModal = false; // used for create mode

constructor() {
super(...arguments);
if (this.wizard.featureState === 'details' || this.wizard.featureState === 'connection') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE', 'database');
}
}

rotateCredentials(backend, name) {
const adapter = this.store.adapterFor('database/connection');
return adapter.rotateRootCredentials(backend, name);
Expand Down
7 changes: 0 additions & 7 deletions ui/app/components/database-role-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,10 @@ const SHOW_ROUTE = 'vault.cluster.secrets.backend.show';
export default class DatabaseRoleEdit extends Component {
@service router;
@service flashMessages;
@service wizard;
@service store;

constructor() {
super(...arguments);
if (
this.wizard.featureState === 'displayConnection' ||
this.wizard.featureState === 'displayRoleDatabase'
) {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE', 'database');
}
if (this.args.initialKey) {
this.args.model.database = [this.args.initialKey];
}
Expand Down
23 changes: 4 additions & 19 deletions ui/app/components/generate-credentials.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const MODEL_TYPES = {
};

export default Component.extend({
wizard: service(),
store: service(),
router: service(),
// set on the component
Expand Down Expand Up @@ -58,13 +57,6 @@ export default Component.extend({
this.createOrReplaceModel();
},

didReceiveAttrs() {
this._super();
if (this.wizard.featureState === 'displayRole') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE', this.backendType);
}
},

willDestroy() {
if (!this.model.isDestroyed && !this.model.isDestroying) {
this.model.unloadRecord();
Expand Down Expand Up @@ -98,17 +90,10 @@ export default Component.extend({
create() {
const model = this.model;
this.set('loading', true);
this.model
.save()
.catch(() => {
if (this.wizard.featureState === 'credentials') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'ERROR', this.backendType);
}
})
.finally(() => {
model.set('hasGenerated', true);
this.set('loading', false);
});
this.model.save().finally(() => {
model.set('hasGenerated', true);
this.set('loading', false);
});
},

codemirrorUpdated(attr, val, codemirror) {
Expand Down
11 changes: 0 additions & 11 deletions ui/app/components/keymgmt/distribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export default class KeymgmtDistribute extends Component {
@service store;
@service flashMessages;
@service router;
@service wizard;

@tracked keyModel;
@tracked isNewKey = false;
Expand All @@ -57,14 +56,6 @@ export default class KeymgmtDistribute extends Component {
this.getKeyInfo(this.args.key);
}
this.formData.operations = [];
this.updateWizard('nextStep');
}

updateWizard(key) {
// wizard will pause unless we manually continue it -- verify that keymgmt tutorial is in progress
if (this.wizard[key] === 'distribute') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE', 'keymgmt');
}
}

get keyTypes() {
Expand Down Expand Up @@ -198,8 +189,6 @@ export default class KeymgmtDistribute extends Component {
this.store.clearDataset('keymgmt/key');
const providerModel = this.store.peekRecord('keymgmt/provider', provider);
providerModel.fetchKeys(providerModel.keys?.meta?.currentPage || 1);
// move wizard forward if tutorial is in progress
this.updateWizard('featureState');
this.args.onClose();
})
.catch((e) => {
Expand Down
14 changes: 0 additions & 14 deletions ui/app/components/mount-backend-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { methods } from 'vault/helpers/mountable-auth-methods';

export default class MountBackendForm extends Component {
@service store;
@service wizard;
@service flashMessages;

// validation related properties
Expand Down Expand Up @@ -139,22 +138,9 @@ export default class MountBackendForm extends Component {
this.args.mountModel[name] = value;
}

@action
onTypeChange(path, value) {
if (path === 'type') {
this.wizard.set('componentState', value);
}
}

@action
setMountType(value) {
this.args.mountModel.type = value;
this.checkPathChange(value);
if (value) {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE', this.args.mountModel.type);
} else if (this.wizard.featureState === 'idle') {
// resets wizard
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'RESET', this.args.mountModel.type);
}
}
}
17 changes: 0 additions & 17 deletions ui/app/components/role-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const SHOW_ROUTE = 'vault.cluster.secrets.backend.show';

export default Component.extend(FocusOnInsertMixin, {
router: service(),
wizard: service(),

mode: null,
emptyData: '{\n}',
Expand All @@ -21,19 +20,6 @@ export default Component.extend(FocusOnInsertMixin, {
model: null,
requestInFlight: or('model.isLoading', 'model.isReloading', 'model.isSaving'),

didReceiveAttrs() {
this._super(...arguments);
if (
(this.wizard.featureState === 'details' && this.mode === 'create') ||
(this.wizard.featureState === 'role' && this.mode === 'show')
) {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE', this.backendType);
}
if (this.wizard.featureState === 'displayRole') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'NOOP', this.backendType);
}
},

willDestroyElement() {
this._super(...arguments);
if (this.model && this.model.isError) {
Expand Down Expand Up @@ -69,9 +55,6 @@ export default Component.extend(FocusOnInsertMixin, {
const model = this.model;
return model[method]().then(() => {
if (!model.isError) {
if (this.wizard.featureState === 'role') {
this.wizard.transitionFeatureMachine('role', 'CONTINUE', this.backendType);
}
successCallback(model);
}
});
Expand Down
4 changes: 0 additions & 4 deletions ui/app/components/secret-create-or-update.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export default class SecretCreateOrUpdate extends Component {
@service controlGroup;
@service router;
@service store;
@service wizard;

@action
setup(elem, [secretData, model, mode]) {
Expand Down Expand Up @@ -164,9 +163,6 @@ export default class SecretCreateOrUpdate extends Component {
});
}
saveComplete(callback, key) {
if (this.wizard.featureState === 'secret') {
this.wizard.transitionFeatureMachine('secret', 'CONTINUE');
}
callback(key);
}
transitionToRoute() {
Expand Down
5 changes: 0 additions & 5 deletions ui/app/components/secret-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { maybeQueryRecord } from 'vault/macros/maybe-query-record';
import { alias, or } from '@ember/object/computed';

export default class SecretEdit extends Component {
@service wizard;
@service store;

@tracked secretData = null;
Expand All @@ -43,10 +42,6 @@ export default class SecretEdit extends Component {
}
this.secretData = KVObject.create({ content: [] }).fromJSON(model.secretData);
this.codemirrorString = this.secretData.toJSONString();
if (this.wizard.featureState === 'details' && this.args.mode === 'create') {
const engine = model.backend.includes('kv') ? 'kv' : model.backend;
this.wizard.transitionFeatureMachine('details', 'CONTINUE', engine);
}
}

@maybeQueryRecord(
Expand Down
2 changes: 1 addition & 1 deletion ui/app/components/splash-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* content here
* </SplashPage
* ```
* @param {boolean} [hasAltContent] - boolean to bypass the UiWizard.
* @param {boolean} [hasAltContent] - boolean to bypass container styling
* @param {boolean} [showTruncatedNavBar = true] - boolean to hide or show the navBar. By default this is true.
*
*/
Expand Down
4 changes: 0 additions & 4 deletions ui/app/components/tool-actions-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const WRAPPING_ENDPOINTS = ['lookup', 'wrap', 'unwrap', 'rewrap'];

export default Component.extend(DEFAULTS, {
store: service(),
wizard: service(),
// putting these attrs here so they don't get reset when you click back
//random
bytes: 32,
Expand Down Expand Up @@ -93,9 +92,6 @@ export default Component.extend(DEFAULTS, {
const keyName = action === 'rewrap' ? 'rewrap_token' : 'token';
props = assign({}, props, { [keyName]: resp.wrap_info.token });
}
if (props.token || props.rewrap_token || props.unwrap_data || action === 'lookup') {
this.wizard.transitionFeatureMachine(this.wizard.featureState, 'CONTINUE');
}
setProperties(this, props);
},

Expand Down
8 changes: 0 additions & 8 deletions ui/app/components/transit-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const SHOW_ROUTE = 'vault.cluster.secrets.backend.show';

export default Component.extend(FocusOnInsertMixin, {
router: service(),
wizard: service(),
mode: null,
onDataChange() {},
onRefresh() {},
Expand Down Expand Up @@ -56,13 +55,6 @@ export default Component.extend(FocusOnInsertMixin, {
const key = this.key;
return key[method]().then(() => {
if (!key.isError) {
if (this.wizard.featureState === 'secret') {
this.wizard.transitionFeatureMachine('secret', 'CONTINUE');
} else {
if (this.wizard.featureState === 'encryption') {
this.wizard.transitionFeatureMachine('encryption', 'CONTINUE', 'transit');
}
}
successCallback(key);
}
});
Expand Down
5 changes: 0 additions & 5 deletions ui/app/controllers/vault/cluster/init.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { computed } from '@ember/object';
import { inject as service } from '@ember/service';
import Controller from '@ember/controller';

const DEFAULTS = {
Expand All @@ -12,8 +11,6 @@ const DEFAULTS = {
};

export default Controller.extend(DEFAULTS, {
wizard: service(),

reset() {
this.setProperties(DEFAULTS);
},
Expand All @@ -22,8 +19,6 @@ export default Controller.extend(DEFAULTS, {
this.set('loading', false);
this.set('keyData', resp);
this.model.reload();
this.wizard.set('initEvent', 'SAVE');
this.wizard.transitionTutorialMachine(this.wizard.currentState, 'TOSAVE');
},

initError(e) {
Expand Down
Loading