Skip to content

Commit 91cf968

Browse files
roncodesroncodes
authored
Merge pull request #192 from fleetbase/dev-v0.6.28
v0.6.28
2 parents d757975 + 79f2984 commit 91cf968

93 files changed

Lines changed: 936 additions & 542 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎addon/components/admin/avatar-management.js‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,40 +36,38 @@ export default class AdminAvatarManagementComponent extends Component {
3636
@tracked currentCategory;
3737

3838
/**
39-
* The only acceptable file types for avatars, png or svg.
39+
* Selectable categories for avatar management.
4040
*
4141
* @memberof AdminAvatarManagementComponent
4242
*/
43-
get acceptedFileTypes() {
44-
return ['image/svg+xml', 'image/png'];
45-
}
43+
@tracked categories = [
44+
{
45+
name: this.intl.t('resource.vehicles'),
46+
icon: 'car',
47+
type: 'vehicle',
48+
avatars: [],
49+
},
50+
{
51+
name: this.intl.t('resource.places'),
52+
icon: 'building',
53+
type: 'place',
54+
avatars: [],
55+
},
56+
{
57+
name: this.intl.t('resource.drivers'),
58+
icon: 'id-card',
59+
type: 'driver',
60+
avatars: [],
61+
},
62+
];
4663

4764
/**
48-
* Selectable categories for avatar management.
65+
* The only acceptable file types for avatars, png or svg.
4966
*
5067
* @memberof AdminAvatarManagementComponent
5168
*/
52-
get categories() {
53-
return [
54-
{
55-
name: this.intl.t('resource.vehicles'),
56-
icon: 'car',
57-
type: 'vehicle',
58-
avatars: [],
59-
},
60-
{
61-
name: this.intl.t('resource.places'),
62-
icon: 'building',
63-
type: 'place',
64-
avatars: [],
65-
},
66-
{
67-
name: this.intl.t('resource.drivers'),
68-
icon: 'id-card',
69-
type: 'driver',
70-
avatars: [],
71-
},
72-
];
69+
get acceptedFileTypes() {
70+
return ['image/svg+xml', 'image/png'];
7371
}
7472

7573
/**

‎addon/components/admin/navigator-app.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ContentPanel @title={{t "admin.navigator-app.title"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800 mb-4">
1+
<ContentPanel @title={{t "admin.navigator-app.title"}} @open={{true}} @wrapperClass="bordered-classic">
22
<InputGroup @name={{t "admin.navigator-app.name"}}>
33
<ClickToCopy class="px-4 py-2 border rounded-md bg-gray-100 shadow-sm dark:bg-gray-700 border-gray-200 dark:border-gray-800" @value={{this.url}}>{{this.url}}</ClickToCopy>
44
<Attach::Tooltip @class="clean" @animation="scale" @placement="top">

‎addon/components/driver/details.hbs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454

5555
<CustomField::Yield @subject={{@resource}} @viewMode={{true}} @wrapperClass="bordered-top" />
5656

57+
<RegistryYield @registry="fleet-ops:component:driver:details" as |RegistryComponent|>
58+
<RegistryComponent @resource={{@resource}} @controller={{@controller}} @permission={{get-write-permission @resource}} />
59+
</RegistryYield>
60+
5761
<ContentPanel @title={{t "common.metadata"}} @open={{true}} @actionButtons={{this.metadataButtons}} @wrapperClass="bordered-top" @panelBodyWrapperClass={{unless (is-object-empty @resource.meta) "px-0i" ""}}>
5862
<MetadataViewer @metadata={{@resource.meta}} />
5963
</ContentPanel>

‎addon/components/layout/fleet-ops-sidebar.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import DriverListingComponent from './fleet-ops-sidebar/driver-listing';
77

88
export default class LayoutFleetOpsSidebarComponent extends Component {
99
@service universe;
10+
@service('universe/menu-service') menuService;
1011
@service store;
1112
@service intl;
1213
@service abilities;
@@ -24,8 +25,8 @@ export default class LayoutFleetOpsSidebarComponent extends Component {
2425
}
2526

2627
createMenuItemsFromUniverseRegistry() {
27-
const registeredMenuItems = this.universe.getMenuItemsFromRegistry('engine:fleet-ops');
28-
this.universeMenuPanels = this.universe.getMenuPanelsFromRegistry('engine:fleet-ops');
28+
const registeredMenuItems = this.menuService.getMenuItems('engine:fleet-ops');
29+
this.universeMenuPanels = this.menuService.getMenuPanels('engine:fleet-ops');
2930
this.universeMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === undefined);
3031
this.universeSettingsMenuItems = registeredMenuItems.filter((menuItem) => menuItem.section === 'settings');
3132
}

‎addon/components/map/drawer.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Drawer @onResizeEnd={{this.mapDrawer.handleResizeEnd}} @onResizeStart={{@onResizeStart}} @isMinimized={{this.mapDrawer.isMinimized}} @isOpen={{@isOpen}} @notchEnabled={{true}} @onLoad={{this.setDrawerContext}}>
22
<TabNavigation @tabs={{this.tabs}} @activeTabId={{this.mapDrawer.activeTabId}} @onTabChange={{this.mapDrawer.setActiveTab}} as |activeTab|>
3-
{{component activeTab.component}}
3+
{{component (lazy-engine-component activeTab.component)}}
44
</TabNavigation>
55
</Drawer>

‎addon/components/map/drawer.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import { isArray } from '@ember/array';
66
export default class MapDrawerComponent extends Component {
77
@service mapDrawer;
88
@service universe;
9+
@service('universe/menu-service') menuService;
910

1011
get tabs() {
11-
const registeredTabs = this.universe.getMenuItemsFromRegistry('fleet-ops:component:map:drawer');
12+
const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:map:drawer');
1213
return [
1314
this.universe._createMenuItem('Vehicles', null, { icon: 'car', component: 'map/drawer/vehicle-listing' }),
1415
this.universe._createMenuItem('Drivers', null, { icon: 'id-card', component: 'map/drawer/driver-listing' }),

‎addon/components/map/leaflet-live-map.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default class MapLeafletLiveMapComponent extends Component {
2828
@service abilities;
2929
@service intl;
3030
@service universe;
31+
@service('universe/menu-service') menuService;
3132

3233
/** properties */
3334
id = guidFor(this);
@@ -315,7 +316,7 @@ export default class MapLeafletLiveMapComponent extends Component {
315316
].filter(Boolean);
316317

317318
const registry = this.leafletContextmenuManager.createContextMenu('map', map, items);
318-
this.universe.createRegistryEvent('fleet-ops:contextmenu:map', 'created', registry, this.leafletContextmenuManager);
319+
this.universe.trigger('fleet-ops:contextmenu:map:created', registry, this.leafletContextmenuManager);
319320

320321
return registry;
321322
}
@@ -341,7 +342,7 @@ export default class MapLeafletLiveMapComponent extends Component {
341342

342343
// create contextmenu registry
343344
const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`zone:${zone.public_id}`, layer, items, { zone });
344-
this.universe.createRegistryEvent('fleet-ops:contextmenu:zone', 'created', contextmenuRegistry, this.leafletContextmenuManager);
345+
this.universe.trigger('fleet-ops:contextmenu:zone:created', contextmenuRegistry, this.leafletContextmenuManager);
345346

346347
return contextmenuRegistry;
347348
}
@@ -375,7 +376,7 @@ export default class MapLeafletLiveMapComponent extends Component {
375376

376377
// create contextmenu registry
377378
const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`service-area:${serviceArea.public_id}`, layer, items, { serviceArea });
378-
this.universe.createRegistryEvent('fleet-ops:contextmenu:service-area', 'created', contextmenuRegistry, this.leafletContextmenuManager);
379+
this.universe.trigger('fleet-ops:contextmenu:service-area:created', contextmenuRegistry, this.leafletContextmenuManager);
379380

380381
return contextmenuRegistry;
381382
}
@@ -404,7 +405,7 @@ export default class MapLeafletLiveMapComponent extends Component {
404405
];
405406

406407
// append items from universe registry
407-
const registeredContextMenuItems = this.universe.getMenuItemsFromRegistry('fleet-ops:contextmenu:driver');
408+
const registeredContextMenuItems = this.menuService.getMenuItems('fleet-ops:contextmenu:driver');
408409
if (isArray(registeredContextMenuItems)) {
409410
items = [
410411
...items,
@@ -427,7 +428,7 @@ export default class MapLeafletLiveMapComponent extends Component {
427428

428429
// create contextmenu registry
429430
const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`driver:${driver.public_id}`, layer, items, { driver });
430-
this.universe.createRegistryEvent('fleet-ops:contextmenu:driver', 'created', contextmenuRegistry, this.leafletContextmenuManager);
431+
this.universe.trigger('fleet-ops:contextmenu:driver:created', contextmenuRegistry, this.leafletContextmenuManager);
431432

432433
return contextmenuRegistry;
433434
}
@@ -452,7 +453,7 @@ export default class MapLeafletLiveMapComponent extends Component {
452453
];
453454

454455
// append items from universe registry
455-
const registeredContextMenuItems = this.universe.getMenuItemsFromRegistry('fleet-ops:contextmenu:vehicle');
456+
const registeredContextMenuItems = this.menuService.getMenuItems('fleet-ops:contextmenu:vehicle');
456457
if (isArray(registeredContextMenuItems)) {
457458
items = [
458459
...items,
@@ -475,7 +476,7 @@ export default class MapLeafletLiveMapComponent extends Component {
475476

476477
// create contextmenu registry
477478
const contextmenuRegistry = this.leafletContextmenuManager.createContextMenu(`vehicle:${vehicle.public_id}`, layer, items, { vehicle });
478-
this.universe.createRegistryEvent('fleet-ops:contextmenu:vehicle', 'created', contextmenuRegistry, this.leafletContextmenuManager);
479+
this.universe.trigger('fleet-ops:contextmenu:vehicle:created', contextmenuRegistry, this.leafletContextmenuManager);
479480

480481
return contextmenuRegistry;
481482
}

‎addon/components/order-config-manager.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import findActiveTab from '../utils/find-active-tab';
2020
const configManagerContext = EmberObject.extend(Evented);
2121
export default class OrderConfigManagerComponent extends Component {
2222
@service universe;
23+
@service('universe/menu-service') menuService;
2324
@service notifications;
2425
@service modalsManager;
2526
@service store;
@@ -39,7 +40,7 @@ export default class OrderConfigManagerComponent extends Component {
3940
* @type {Array}
4041
*/
4142
get tabs() {
42-
const registeredTabs = this.universe.getMenuItemsFromRegistry('fleet-ops:component:order-config-manager');
43+
const registeredTabs = this.menuService.getMenuItems('fleet-ops:component:order-config-manager');
4344
const defaultTabs = [
4445
this.universe._createMenuItem(this.intl.t('order-config-manager.tabs.details'), null, { icon: 'circle-info', component: OrderConfigManagerDetailsComponent }),
4546
this.universe._createMenuItem(this.intl.t('order-config-manager.tabs.custom-fields'), null, { icon: 'rectangle-list', component: OrderConfigManagerCustomFieldsComponent }),

‎addon/components/order/details/purchase-rate.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{{#if @resource.purchase_rate}}
2-
<ContentPanel @title={{t "order.fields.purchase-rate-panel-title"}} @isLoading={{@isLoading}} @open={{true}} @wrapperClass="bordered-top">
2+
<ContentPanel @title={{t "order.fields.purchase-rate-panel-title"}} @isLoading={{@isLoading}} @open={{true}} @wrapperClass="bordered-top" @panelBodyWrapperClass="px-0i">
33
<div class="order-view-purchase-rate-table-wrapper next-table-wrapper no-scroll h-auto table-fluid rounded-b-md">
44
<table id="order-view-purchase-rate-table" class="table table-fixed flex-1">
55
<thead>
66
<tr>
7-
<th class="text-left">{{t "fleet-ops.operations.orders.index.new.breakdown"}}</th>
7+
<th class="text-left">{{t "order.fields.breakdown"}}</th>
88
<th>
99
<div class="flex flex-row items-center justify-end">{{@resource.purchase_rate.service_quote.currency}}</div>
1010
</th>

‎addon/components/order/form/payload.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<div>
112112
<Input @value={{entity.sku}} @type="text" class="w-full form-input form-input-sm" placeholder={{t "order.fields.sku"}} />
113113
</div>
114-
<RegistryYield @registry="fleet-ops:template:operations:orders:new:entities-input:entity" as |RegistryComponent|>
114+
<RegistryYield @registry="fleet-ops:component:order:form:payload:entity:form" as |RegistryComponent|>
115115
<RegistryComponent @entity={{entity}} @order={{@resource}} @controller={{this}} />
116116
</RegistryYield>
117117
{{#if @resource.payload.waypoints.length}}

0 commit comments

Comments
 (0)