Skip to content
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
8 changes: 7 additions & 1 deletion addon/components/order/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,13 @@ export default class OrderFormComponent extends Component {
});
this.args.resource.payload.set('type', orderConfig.key);

this.customFields = yield this.customFieldsRegistry.loadSubjectCustomFields.perform(orderConfig);
// loadSubjectCustomFields rejects when the custom fields cannot be loaded (ember-core 0.3.25).
try {
this.customFields = yield this.customFieldsRegistry.loadSubjectCustomFields.perform(orderConfig);
} catch (err) {
this.customFields = undefined;
debug('Unable to load order custom fields: ' + err.message);
}
}

@task *selectDriver(driver) {
Expand Down
11 changes: 10 additions & 1 deletion addon/controllers/analytics/reports/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class AnalyticsReportsIndexController extends Controller {
@service intl;

/** query params */
@tracked queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'name', 'created_at'];
@tracked queryParams = this.reportActions.queryParamsFor(['page', 'limit', 'sort', 'query', 'public_id', 'name', 'created_at']);
@tracked page = 1;
@tracked limit;
@tracked sort = '-created_at';
Expand All @@ -20,11 +20,13 @@ export default class AnalyticsReportsIndexController extends Controller {
get actionButtons() {
return [
{
id: 'refresh',
icon: 'refresh',
onClick: this.reportActions.refresh,
helpText: this.intl.t('common.refresh'),
},
{
id: 'create',
text: this.intl.t('common.new'),
type: 'primary',
icon: 'plus',
Expand All @@ -37,6 +39,7 @@ export default class AnalyticsReportsIndexController extends Controller {
get bulkActions() {
return [
{
id: 'bulk-delete',
label: 'Delete selected...',
class: 'text-red-500',
fn: this.reportActions.bulkDelete,
Expand All @@ -48,6 +51,7 @@ export default class AnalyticsReportsIndexController extends Controller {
get columns() {
return [
{
id: 'title',
sticky: true,
label: 'Title',
valuePath: 'title',
Expand All @@ -59,6 +63,7 @@ export default class AnalyticsReportsIndexController extends Controller {
filterComponent: 'filter/string',
},
{
id: 'public-id',
label: 'ID',
valuePath: 'public_id',
cellComponent: 'click-to-copy',
Expand All @@ -69,6 +74,7 @@ export default class AnalyticsReportsIndexController extends Controller {
filterComponent: 'filter/string',
},
{
id: 'row-actions',
label: '',
cellComponent: 'table/cell/dropdown',
ddButtonText: false,
Expand All @@ -81,11 +87,13 @@ export default class AnalyticsReportsIndexController extends Controller {
width: 60,
actions: [
{
id: 'view',
label: 'View report...',
fn: this.reportActions.transition.view,
permission: 'iam view report',
},
{
id: 'edit',
label: 'Edit report...',
fn: this.reportActions.transition.edit,
permission: 'iam update report',
Expand All @@ -94,6 +102,7 @@ export default class AnalyticsReportsIndexController extends Controller {
separator: true,
},
{
id: 'delete',
label: 'Delete report...',
fn: this.reportActions.delete,
permission: 'iam delete report',
Expand Down
10 changes: 8 additions & 2 deletions addon/controllers/connectivity/devices/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
@service trailerActions;

/** query params */
@tracked queryParams = [
@tracked queryParams = this.deviceActions.queryParamsFor([
'name',
'status',
'attachment_state',
Expand All @@ -36,7 +36,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
'public_id',
'created_at',
'updated_at',
];
]);
@tracked page = 1;
@tracked limit;
@tracked sort = '-created_at';
Expand All @@ -56,25 +56,29 @@ export default class ConnectivityDevicesIndexController extends Controller {
/** action buttons */
@tracked actionButtons = [
{
id: 'refresh',
icon: 'refresh',
onClick: this.deviceActions.refresh,
helpText: this.intl.t('common.refresh'),
},
{
id: 'create',
text: this.intl.t('common.new'),
type: 'primary',
icon: 'plus',
onClick: this.deviceActions.transition.create,
permission: 'fleet-ops create device',
},
{
id: 'import',
text: this.intl.t('common.import'),
type: 'magic',
icon: 'upload',
onClick: this.deviceActions.import,
permission: 'fleet-ops import device',
},
{
id: 'export',
text: this.intl.t('common.export'),
icon: 'long-arrow-up',
iconClass: 'rotate-icon-45',
Expand All @@ -87,6 +91,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
/** bulk action buttons */
@tracked bulkActions = [
{
id: 'bulk-delete',
label: 'Delete selected...',
class: 'text-red-500',
fn: this.deviceActions.bulkDelete,
Expand All @@ -111,6 +116,7 @@ export default class ConnectivityDevicesIndexController extends Controller {
separator: true,
},
{
id: 'delete',
label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.device') }),
fn: this.deviceActions.delete,
permission: 'fleet-ops delete device',
Expand Down
1 change: 1 addition & 0 deletions addon/controllers/connectivity/devices/index/details.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export default class ConnectivityDevicesIndexDetailsController extends Controlle
permission: 'fleet-ops update device',
},
{
id: 'more',
icon: 'ellipsis-h',
iconPrefix: 'fas',
renderInPlace: true,
Expand Down
32 changes: 31 additions & 1 deletion addon/controllers/connectivity/events/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,20 @@ export default class ConnectivityEventsIndexController extends Controller {
@service telematicActions;

/** query params */
@tracked queryParams = ['page', 'limit', 'sort', 'query', 'telematic', 'device', 'event_type', 'severity', 'processed', 'occurred_at', 'created_at', 'updated_at'];
@tracked queryParams = this.deviceEventActions.queryParamsFor([
'page',
'limit',
'sort',
'query',
'telematic',
'device',
'event_type',
'severity',
'processed',
'occurred_at',
'created_at',
'updated_at',
]);
@tracked page = 1;
@tracked limit;
@tracked sort = '-created_at';
Expand All @@ -95,6 +108,7 @@ export default class ConnectivityEventsIndexController extends Controller {
/** action buttons */
@tracked actionButtons = [
{
id: 'refresh',
icon: 'refresh',
onClick: this.deviceEventActions.refresh,
helpText: this.intl.t('common.refresh'),
Expand All @@ -107,6 +121,7 @@ export default class ConnectivityEventsIndexController extends Controller {
/** columns */
@tracked columns = [
{
id: 'event-type',
sticky: true,
label: 'Event',
valuePath: 'event_type',
Expand All @@ -121,6 +136,7 @@ export default class ConnectivityEventsIndexController extends Controller {
filterComponent: 'filter/string',
},
{
id: 'device-display-name',
label: 'Device',
valuePath: 'device.displayName',
cellComponent: 'cell/device-identity',
Expand All @@ -137,6 +153,7 @@ export default class ConnectivityEventsIndexController extends Controller {
modelNamePath: 'displayName',
},
{
id: 'provider',
label: 'Provider',
valuePath: 'provider',
cellComponent: 'cell/telematic-identity',
Expand All @@ -152,6 +169,7 @@ export default class ConnectivityEventsIndexController extends Controller {
model: 'telematic',
},
{
id: 'severity',
label: 'Severity',
valuePath: 'severity',
cellComponent: 'table/cell/status',
Expand All @@ -165,12 +183,14 @@ export default class ConnectivityEventsIndexController extends Controller {
filterOptionValue: 'value',
},
{
id: 'message',
label: 'Message',
valuePath: 'message',
resizable: true,
sortable: false,
},
{
id: 'code',
label: 'Code',
valuePath: 'code',
resizable: true,
Expand All @@ -180,27 +200,31 @@ export default class ConnectivityEventsIndexController extends Controller {
filterComponent: 'filter/string',
},
{
id: 'ident',
label: 'IDENT',
valuePath: 'ident',
hidden: true,
resizable: true,
sortable: true,
},
{
id: 'protocol',
label: 'Protocol',
valuePath: 'protocol',
hidden: true,
resizable: true,
sortable: true,
},
{
id: 'state',
label: 'State',
valuePath: 'state',
hidden: true,
resizable: true,
sortable: true,
},
{
id: 'processed-at',
label: 'Processed',
valuePath: 'processedAt',
sortParam: 'processed_at',
Expand All @@ -214,6 +238,7 @@ export default class ConnectivityEventsIndexController extends Controller {
filterOptionValue: 'value',
},
{
id: 'occurred-at',
label: 'Occurred',
valuePath: 'occurredAt',
sortParam: 'occurred_at',
Expand All @@ -224,6 +249,7 @@ export default class ConnectivityEventsIndexController extends Controller {
filterComponent: 'filter/date',
},
{
id: 'created-at',
label: this.intl.t('column.created-at'),
valuePath: 'createdAt',
sortParam: 'created_at',
Expand All @@ -234,6 +260,7 @@ export default class ConnectivityEventsIndexController extends Controller {
filterComponent: 'filter/date',
},
{
id: 'updated-at',
label: this.intl.t('column.updated-at'),
valuePath: 'updatedAt',
sortParam: 'updated_at',
Expand All @@ -245,6 +272,7 @@ export default class ConnectivityEventsIndexController extends Controller {
hidden: true,
},
{
id: 'row-actions',
label: '',
cellComponent: 'table/cell/dropdown',
ddButtonText: false,
Expand All @@ -257,11 +285,13 @@ export default class ConnectivityEventsIndexController extends Controller {
width: 60,
actions: [
{
id: 'view',
label: this.intl.t('common.view-resource', { resource: this.intl.t('resource.device-event') }),
fn: this.deviceEventActions.transition.view,
permission: 'fleet-ops view device-event',
},
{
id: 'mark-processed',
label: 'Mark processed',
fn: this.markProcessed,
permission: 'fleet-ops update device-event',
Expand Down
Loading
Loading