Skip to content

Commit

Permalink
Merge pull request #22 from fleetbase/dev-v0.1.9
Browse files Browse the repository at this point in the history
v0.1.9
  • Loading branch information
roncodes authored Oct 26, 2023
2 parents d35999c + f0748cc commit 36eae70
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 27 deletions.
11 changes: 8 additions & 3 deletions addon/controllers/api-keys/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { action, computed } from '@ember/object';
import { isBlank } from '@ember/utils';
import { not } from '@ember/object/computed';
import { timeout } from 'ember-concurrency';
import { later } from '@ember/runloop';
import { task } from 'ember-concurrency-decorators';
import { format as formatDate } from 'date-fns';

Expand Down Expand Up @@ -483,9 +484,13 @@ export default class ApiKeysIndexController extends Controller {
}
)
.then(() => {
setTimeout(() => {
return done();
}, 600);
later(
this,
() => {
return done();
},
600
);
})
.catch((error) => {
modal.stopLoading();
Expand Down
2 changes: 1 addition & 1 deletion addon/routes/api-keys/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default class ApiKeysIndexRoute extends Route {
};

@action loading(transition) {
this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading api keys...');
this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading api keys...' });
}

model(params) {
Expand Down
2 changes: 1 addition & 1 deletion addon/routes/events/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class EventsIndexRoute extends Route {
};

@action loading(transition) {
this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading events...');
this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading events...' });
}

model(params) {
Expand Down
2 changes: 1 addition & 1 deletion addon/routes/logs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default class LogsIndexRoute extends Route {
};

@action loading(transition) {
this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading logs...');
this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading logs...' });
}

model(params) {
Expand Down
2 changes: 1 addition & 1 deletion addon/routes/sockets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ export default class SocketsIndexRoute extends Route {
@service loader;

@action loading(transition) {
this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading websockets...');
this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading websockets...' });
}
}
2 changes: 1 addition & 1 deletion addon/routes/webhooks/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class WebhooksIndexRoute extends Route {
};

@action loading(transition) {
this.loader.showOnInitialTransition(transition, 'section.next-view-section', 'Loading webhooks...');
this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading webhooks...' });
}

model(params) {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fleetbase/dev-engine",
"version": "0.1.8",
"version": "0.1.9",
"description": "Fleetbase Developers extension provides a module for managing developer resources such as API keys, webhooks, sockets, events and logs.",
"fleetbase": {
"route": "developers"
Expand Down Expand Up @@ -38,8 +38,8 @@
"publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
},
"dependencies": {
"@fleetbase/ember-core": "^0.1.2",
"@fleetbase/ember-ui": "^0.1.8",
"@fleetbase/ember-core": "^0.1.6",
"@fleetbase/ember-ui": "^0.2.1",
"@fortawesome/ember-fontawesome": "^0.4.1",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
Expand Down
32 changes: 16 additions & 16 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 36eae70

Please sign in to comment.