Skip to content

Manage driver, customer and contact login accounts from the profile #338

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.

Sign up for GitHub

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

Merged
roncodes merged 4 commits into from
Sep 22, 2026
Merged

Manage driver, customer and contact login accounts from the profile #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1765536
feat: manage driver, customer and contact login accounts from the pro…
roncodes Sep 21, 2026
0055e88
test: restore request authorization coverage and cover orphaned telem…
roncodes Sep 21, 2026
e709e71
fix: don't log from the profile account conversion migration
roncodes Sep 21, 2026
593f1e3
fix: repair driver and customer memberships with their profile role
roncodes Sep 22, 2026
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
15 changes: 13 additions & 2 deletions addon/components/contact/form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,22 @@
<Input @value={{@resource.title}} @type="text" class="w-full form-input" placeholder={{t "common.title"}} disabled={{cannot-write @resource}} />
</InputGroup>
<InputGroup @name={{t "common.email"}}>
<Input @value={{@resource.email}} @type="text" class="w-full form-input" placeholder={{t "common.email"}} disabled={{cannot-write @resource}} />
<Input
@value={{@resource.email}}
@type="text"
class="w-full form-input"
placeholder={{t "common.email"}}
disabled={{or (cannot-write @resource) @resource.is_staff_linked}}
/>
</InputGroup>
<InputGroup @name={{t "common.phone"}}>
<PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{cannot-write @resource}} />
<PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{or (cannot-write @resource) @resource.is_staff_linked}} />
</InputGroup>
{{#if @resource.is_staff_linked}}
<div class="lg:col-span-2 -mt-1 mb-2 text-xs text-gray-500 dark:text-gray-400" data-test-staff-linked-helper>{{t "profile-account.staff-linked-helper"}}</div>
{{else if @resource.isNew}}
<ProfileIdentityHint @email={{@resource.email}} @phone={{@resource.phone}} @type="contact" class="lg:col-span-2" />
{{/if}}
<InputGroup @name={{t "common.internal-id"}}>
<Input @value={{@resource.internal_id}} @type="text" class="w-full form-input" placeholder={{t "common.internal-id"}} disabled={{cannot-write @resource}} />
</InputGroup>
Expand Down
15 changes: 13 additions & 2 deletions addon/components/customer/form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,22 @@
<Input @value={{@resource.title}} @type="text" class="w-full form-input" placeholder={{t "common.title"}} disabled={{cannot-write @resource}} />
</InputGroup>
<InputGroup @name={{t "common.email"}}>
<Input @value={{@resource.email}} @type="text" class="w-full form-input" placeholder={{t "common.email"}} disabled={{cannot-write @resource}} />
<Input
@value={{@resource.email}}
@type="text"
class="w-full form-input"
placeholder={{t "common.email"}}
disabled={{or (cannot-write @resource) @resource.is_staff_linked}}
/>
</InputGroup>
<InputGroup @name={{t "common.phone"}}>
<PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{cannot-write @resource}} />
<PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{or (cannot-write @resource) @resource.is_staff_linked}} />
</InputGroup>
{{#if @resource.is_staff_linked}}
<div class="lg:col-span-2 -mt-1 mb-2 text-xs text-gray-500 dark:text-gray-400" data-test-staff-linked-helper>{{t "profile-account.staff-linked-helper"}}</div>
{{else if @resource.isNew}}
<ProfileIdentityHint @email={{@resource.email}} @phone={{@resource.phone}} @type="customer" class="lg:col-span-2" />
{{/if}}
<InputGroup @name={{t "common.internal-id"}}>
<Input @value={{@resource.internal_id}} @type="text" class="w-full form-input" placeholder={{t "common.internal-id"}} disabled={{cannot-write @resource}} />
</InputGroup>
Expand Down
56 changes: 0 additions & 56 deletions addon/components/customer/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,15 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
import { task } from 'ember-concurrency';

export default class CustomerFormComponent extends Component {
@service customerActions;
@service store;
@service fetch;
@service currentUser;
@service notifications;
@service modalsManager;
@service('universe/extension-manager') extensionManager;

@tracked userAccountActionButtons = [
{
icon: 'user-plus',
size: 'xs',
permission: 'iam create user',
onClick: async () => {
// Load IAM engine for user-form modal component
await this.extensionManager.ensureEngineLoaded('@fleetbase/iam-engine');

const user = this.store.createRecord('user', {
status: 'pending',
type: 'user',
});

this.modalsManager.show('modals/user-form', {
title: 'Create a new user',
user,
formPermission: 'iam create user',
uploadNewPhoto: (file) => {
this.fetch.uploadFile.perform(
file,
{
path: `uploads/${this.currentUser.companyId}/users/${user.slug}`,
subject_uui: user.id,
subject_type: 'user',
type: 'user_photo',
},
(uploadedFile) => {
user.setProperties({
avatar_uuid: uploadedFile.id,
avatar_url: uploadedFile.url,
avatar: uploadedFile,
});
}
);
},
confirm: async (modal) => {
modal.startLoading();

try {
await user.save();
this.notifications.success('New user created successfully!');
modal.done();
} catch (error) {
this.notifications.serverError(error);
modal.stopLoading();
}
},
});
},
},
];

get showWelcomeEmailOption() {
return this.args.resource?.isNew && this.extensionManager.isInstalled('@fleetbase/customer-portal-engine');
}
Expand Down
55 changes: 20 additions & 35 deletions addon/components/driver/form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,4 @@
<div class="form-wrapper" ...attributes>
<ContentPanel @title={{t "driver.fields.user-account"}} @open={{true}} @actionButtons={{this.userAccountActionButtons}} @wrapperClass="bordered-top">
<div class="space-y-2">
<InputGroup @name={{t "driver.fields.user-account"}} @helpText={{t "driver.fields.user-account-help-text"}}>
<ModelSelect
@modelName="user"
@selectedItemComponent={{component "select-option/user" compact=true}}
@selectedModel={{@resource.user}}
@placeholder={{t "driver.fields.select-user"}}
@query={{hash doesnt_have_driver=true can_be_driver=true}}
@triggerClass="form-select form-input"
@infiniteScroll={{false}}
@renderInPlace={{true}}
@onChange={{fn (mut @resource.user)}}
@permission="fleet-ops update-user-for driver"
as |model|
>
<SelectOption::User @option={{model}} />
</ModelSelect>
</InputGroup>
{{#if @resource.user}}
<div class="grid grid-cols-1 lg:grid-cols-2 gap-2 no-input-group-padding">
<InputGroup @name={{t "common.name"}} @wrapperClass="col-span-2 mb-0i">
<Input @value={{@resource.user.name}} @type="text" class="w-full form-input" placeholder={{t "common.name"}} disabled={{true}} />
</InputGroup>
<InputGroup @name={{t "common.email"}} @wrapperClass="mb-0i">
<Input @value={{@resource.user.email}} @type="text" class="w-full form-input" placeholder={{t "common.email"}} disabled={{true}} />
</InputGroup>
<InputGroup @name={{t "common.phone"}} @wrapperClass="mb-0i">
<PhoneInput @value={{@resource.user.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{true}} />
</InputGroup>
</div>
{{/if}}
</div>
</ContentPanel>

<ContentPanel @title={{t "driver.fields.driver-details"}} @open={{true}} @wrapperClass="bordered-top">
<div class="flex flex-row space-x-3 mb-3">
<div class="flex items-center justify-start rounded-full">
Expand Down Expand Up @@ -65,6 +30,26 @@
</div>
</div>
<div class="grid grid-cols-1 lg:grid-cols-2 gap-2 text-xs no-input-group-padding">
<InputGroup @name={{t "common.name"}} @required={{true}}>
<Input @value={{@resource.name}} @type="text" class="w-full form-input" placeholder={{t "common.name"}} disabled={{cannot-write @resource}} />
</InputGroup>
<InputGroup @name={{t "common.email"}}>
<Input
@value={{@resource.email}}
@type="text"
class="w-full form-input"
placeholder={{t "common.email"}}
disabled={{or (cannot-write @resource) @resource.is_staff_linked}}
/>
</InputGroup>
<InputGroup @name={{t "common.phone"}}>
<PhoneInput @value={{@resource.phone}} @onInput={{fn (mut @resource.phone)}} class="form-input w-full" disabled={{or (cannot-write @resource) @resource.is_staff_linked}} />
</InputGroup>
{{#if @resource.is_staff_linked}}
<div class="lg:col-span-2 -mt-1 mb-2 text-xs text-gray-500 dark:text-gray-400" data-test-staff-linked-helper>{{t "profile-account.staff-linked-helper"}}</div>
{{else if @resource.isNew}}
<ProfileIdentityHint @email={{@resource.email}} @phone={{@resource.phone}} @type="driver" class="lg:col-span-2" />
{{/if}}
<InputGroup @name={{t "common.internal-id"}}>
<Input @value={{@resource.internal_id}} @type="text" class="w-full form-input" placeholder={{t "common.internal-id"}} disabled={{cannot-write @resource}} />
</InputGroup>
Expand Down
58 changes: 0 additions & 58 deletions addon/components/driver/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,67 +3,9 @@ import { inject as service } from '@ember/service';
import { task } from 'ember-concurrency';

export default class DriverFormComponent extends Component {
@service store;
@service fetch;
@service currentUser;
@service notifications;
@service modalsManager;
@service('universe/extension-manager') extensionManager;

get userAccountActionButtons() {
return [
{
icon: 'user-plus',
size: 'xs',
permission: 'iam create user',
onClick: async () => {
// Load IAM engine for user-form modal component
await this.extensionManager.ensureEngineLoaded('@fleetbase/iam-engine');

const user = this.store.createRecord('user', {
status: 'pending',
type: 'user',
});

this.modalsManager.show('modals/user-form', {
title: 'Create a new user',
user,
formPermission: 'iam create user',
uploadNewPhoto: (file) => {
this.fetch.uploadFile.perform(
file,
{
path: `uploads/${this.currentUser.companyId}/users/${user.slug}`,
subject_uui: user.id,
subject_type: 'user',
type: 'user_photo',
},
(uploadedFile) => {
user.setProperties({
avatar_uuid: uploadedFile.id,
avatar_url: uploadedFile.url,
avatar: uploadedFile,
});
}
);
},
confirm: async (modal) => {
modal.startLoading();

try {
await user.save();
this.notifications.success('New user created successfully!');
modal.done();
} catch (error) {
this.notifications.serverError(error);
modal.stopLoading();
}
},
});
},
},
];
}

@task *handlePhotoUpload(file) {
try {
Expand Down
4 changes: 2 additions & 2 deletions addon/components/modals/driver-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
<label>
{{t "common.email"}}
</label>
<Input @value={{@options.driver.email}} @type="text" class="w-full form-input" placeholder={{t "common.email"}} />
<Input @value={{@options.driver.email}} @type="text" class="w-full form-input" placeholder={{t "common.email"}} disabled={{@options.driver.is_staff_linked}} />
</div>

<div class="input-group">
<label>
{{t "common.phone"}}
</label>
<PhoneInput @value={{@options.driver.phone}} @onInput={{fn (mut @options.driver.phone)}} class="form-input w-full" />
<PhoneInput @value={{@options.driver.phone}} @onInput={{fn (mut @options.driver.phone)}} class="form-input w-full" disabled={{@options.driver.is_staff_linked}} />
</div>

<div class="input-group">
Expand Down
18 changes: 0 additions & 18 deletions addon/components/modals/reset-customer-credentials.hbs
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions addon/components/modals/reset-customer-credentials.js
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions addon/components/modals/reset-profile-credentials.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
<div class="px-4 text-gray-900 dark:text-gray-50">
<div class="mb-1 text-base font-semibold">
{{t "profile-account.prompts.reset-password-heading" name=this.profile.name}}
</div>
<div class="text-sm mb-4">{{t "profile-account.prompts.reset-password-body"}}</div>
<InputGroup>
<div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
<InputGroup @name={{t "profile-account.prompts.new-password"}} @type="password" @value={{this.password}} @wrapperClass="mb-0i" />
<InputGroup @name={{t "profile-account.prompts.confirm-new-password"}} @type="password" @value={{this.confirmPassword}} @wrapperClass="mb-0i" />
</div>
</InputGroup>
<InputGroup>
<Checkbox
@value={{this.sendCredentials}}
@label={{t "profile-account.prompts.send-new-credentials"}}
@onToggle={{fn (mut this.sendCredentials)}}
@alignItems="center"
@labelClass="mb-0i"
/>
</InputGroup>
</div>
</Modal::Default>
Loading
Loading