Skip to content

Commit

Permalink
Merge pull request #23 from fleetbase/dev-v0.2.0
Browse files Browse the repository at this point in the history
v0.2.0
  • Loading branch information
roncodes authored Dec 25, 2023
2 parents 36eae70 + db2d9f6 commit 916a0d1
Show file tree
Hide file tree
Showing 33 changed files with 4,287 additions and 3,532 deletions.
12 changes: 2 additions & 10 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
12 changes: 0 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
21 changes: 8 additions & 13 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
requireConfigFile: false,
babelOptions: {
plugins: [['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }]],
},
},
plugins: ['ember'],
Expand All @@ -21,19 +22,19 @@ module.exports = {
rules: {
'ember/no-array-prototype-extensions': 'off',
'ember/no-computed-properties-in-native-classes': 'off',
'node/no-unpublished-require': [
'n/no-unpublished-require': [
'error',
{
allowModules: ['resolve', 'broccoli-funnel'],
},
],
},
overrides: [
// node files
{
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
Expand All @@ -49,13 +50,7 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
},
{
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
extends: ['plugin:n/recommended'],
},
],
};
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
node-version: [16.x] # Build on Node.js 16
node-version: [18.x] # Build on Node.js 18

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -42,10 +42,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Node.js 16.x
- name: Setup Node.js 18.x
uses: actions/setup-node@v2
with:
node-version: 16.x
node-version: 18.x

- name: Setup pnpm
uses: pnpm/[email protected]
Expand All @@ -71,10 +71,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Setup Node.js 16.x
- name: Setup Node.js 18.x
uses: actions/setup-node@v2
with:
node-version: 16.x
node-version: 18.x

- name: Setup pnpm
uses: pnpm/[email protected]
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
9 changes: 2 additions & 7 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -18,11 +14,11 @@
/.gitignore
/.prettierignore
/.prettierrc.js
/.stylelintignore
/.stylelintrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand All @@ -33,7 +29,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
printWidth: 190,
overrides: [
{
files: '*.hbs',
files: '*.{hbs,js,ts}',
options: {
singleQuote: false,
},
Expand Down
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
5 changes: 5 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
};
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Fleetbase Console extension for managing developer API Keys, Webhooks, Sockets,

## Compatibility

* Ember.js v3.24 or above
* Ember CLI v3.24 or above
* Node.js v14 or above
* Ember.js v4.8 or above
* Ember CLI v4.8 or above
* Node.js v18 or above


## Installation
Expand Down
9 changes: 8 additions & 1 deletion addon/controllers/api-keys/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ export default class ApiKeysIndexController extends Controller {
*/
@service hostRouter;

/**
* Inject the `universe` service
*
* @var {Service}
*/
@service universe;

/**
* Queryable parameters for this controller's model
*
Expand Down Expand Up @@ -449,7 +456,7 @@ export default class ApiKeysIndexController extends Controller {
* @void
*/
@action viewRequestLogs(apiKey) {
return this.transitionToRoute('logs.index', {
return this.universe.transitionToEngineRoute('@fleetbase/dev-engine', 'logs.index', {
queryParams: { key: apiKey.id },
});
}
Expand Down
31 changes: 31 additions & 0 deletions addon/controllers/base-controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';

export default class BaseController extends Controller {
/**
* Inject the `universe` service
*
* @var {Service}
*/
@service universe;

/**
* Transitions to a specified route within the '@fleetbase/fleetops-engine' engine.
*
* This action is a wrapper around the `transitionToEngineRoute` method of the `universe` service (or object),
* specifically targeting the '@fleetbase/fleetops-engine'. It allows for easy transitioning to routes
* within this engine, abstracting away the need to repeatedly specify the engine name.
*
* @param {string} route - The route within the '@fleetbase/fleetops-engine' to transition to.
* @param {...any} args - Additional arguments to pass to the transitionToEngineRoute method.
* @returns {Promise} A Promise that resolves with the result of the transitionToEngineRoute method.
*
* @example
* // To transition to the 'management.fleets.index.new' route within the '@fleetbase/fleetops-engine'
* this.transitionToRoute('management.fleets.index.new');
*/
@action transitionToRoute(route, ...args) {
return this.universe.transitionToEngineRoute('@fleetbase/dev-engine', route, ...args);
}
}
4 changes: 2 additions & 2 deletions addon/controllers/events/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Controller from '@ember/controller';
import BaseController from '../base-controller';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
Expand All @@ -7,7 +7,7 @@ import { timeout } from 'ember-concurrency';
import { task } from 'ember-concurrency-decorators';
import fetchFrom from '@fleetbase/ember-core/decorators/fetch-from';

export default class EventsIndexController extends Controller {
export default class EventsIndexController extends BaseController {
/**
* Inject the `filters` service
*
Expand Down
4 changes: 2 additions & 2 deletions addon/controllers/logs/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Controller from '@ember/controller';
import BaseController from '../base-controller';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
Expand All @@ -8,7 +8,7 @@ import { task } from 'ember-concurrency-decorators';
import fromStore from '@fleetbase/ember-core/decorators/from-store';
import fetchFrom from '@fleetbase/ember-core/decorators/fetch-from';

export default class LogsIndexController extends Controller {
export default class LogsIndexController extends BaseController {
/**
* Inject the `filters` service
*
Expand Down
4 changes: 2 additions & 2 deletions addon/controllers/sockets/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Controller from '@ember/controller';
import BaseController from '../base-controller';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { action, computed } from '@ember/object';
import fromStore from '@fleetbase/ember-core/decorators/from-store';

export default class SocketsIndexController extends Controller {
export default class SocketsIndexController extends BaseController {
/**
* Inject the `modalsManager` service
*
Expand Down
4 changes: 2 additions & 2 deletions addon/controllers/webhooks/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Controller from '@ember/controller';
import BaseController from '../base-controller';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { action, computed } from '@ember/object';
Expand All @@ -9,7 +9,7 @@ import groupApiEvents from '@fleetbase/ember-core/utils/group-api-events';
import fromStore from '@fleetbase/ember-core/decorators/from-store';
import fetchFrom from '@fleetbase/ember-core/decorators/fetch-from';

export default class WebhooksIndexController extends Controller {
export default class WebhooksIndexController extends BaseController {
/**
* Inject the `currentUser` service
*
Expand Down
Loading

0 comments on commit 916a0d1

Please sign in to comment.