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

Backport 1.17.x UI: remove ember-fetch which used vulnerable version of rollup #28586

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
1 change: 0 additions & 1 deletion ui/app/adapters/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { service } from '@ember/service';
import { set } from '@ember/object';
import RSVP from 'rsvp';
import config from '../config/environment';
import fetch from 'fetch';

const { APP } = config;
const { POLLING_URLS, NAMESPACE_ROOT_URLS } = APP;
Expand Down
1 change: 0 additions & 1 deletion ui/app/components/raft-storage-restore.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { task } from 'ember-concurrency';
import { getOwner } from '@ember/application';
import { service } from '@ember/service';
import { alias } from '@ember/object/computed';
import { AbortController } from 'fetch';

export default Component.extend({
file: null,
Expand Down
1 change: 0 additions & 1 deletion ui/app/services/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { computed, get } from '@ember/object';
import { alias } from '@ember/object/computed';
import Service, { inject as service } from '@ember/service';
import { capitalize } from '@ember/string';
import fetch from 'fetch';
import { resolve, reject } from 'rsvp';

import getStorage from 'vault/lib/token-storage';
Expand Down
1 change: 0 additions & 1 deletion ui/mirage/handlers/mfa-login.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import { Response } from 'miragejs';
import Ember from 'ember';
import fetch from 'fetch';

// initial auth response cache -- lookup by mfa_request_id key
const authResponses = {};
Expand Down
1 change: 0 additions & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
"ember-data": "~4.12.4",
"ember-engines": "0.8.23",
"ember-exam": "^9.0.0",
"ember-fetch": "^8.1.2",
"ember-inflector": "4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-modal-dialog": "^4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'ember-qunit';
import { setupMirage } from 'ember-cli-mirage/test-support';
import { render, triggerEvent, click } from '@ember/test-helpers';
import { render, triggerEvent, click, waitFor } from '@ember/test-helpers';
import hbs from 'htmlbars-inline-precompile';

module('Integration | Component | raft-storage-restore', function (hooks) {
Expand All @@ -30,6 +30,7 @@ module('Integration | Component | raft-storage-restore', function (hooks) {
files: [new Blob(['Raft Snapshot'])],
});
await click('[data-test-edit-form-submit]');
await waitFor('#force-restore');
await click('#force-restore');
await click('[data-test-edit-form-submit]');
});
Expand Down
Loading
Loading