diff --git a/src/app/admin/api-keys/api-keys.component.ts b/src/app/admin/api-keys/api-keys.component.ts index 25a96f39d..07eb022c4 100644 --- a/src/app/admin/api-keys/api-keys.component.ts +++ b/src/app/admin/api-keys/api-keys.component.ts @@ -2,7 +2,7 @@ import { Clipboard } from '@angular/cdk/clipboard'; import { Component, OnInit, inject } from '@angular/core'; import { i18n } from '../../common/locale.service'; -import { notifyInfo } from '../../common/notifications'; +import { notifySuccess } from '../../common/notifications'; import { IconComponent } from '../../ui/icon.component'; import { DateFromPipe } from '../../ui/pipes/date-from.pipe'; import { SimpleTableComponent } from '../../ui/simple-table.component'; @@ -244,6 +244,6 @@ export class AdminAPIKeysComponent implements OnInit { const key = this.last_key(); if (!key?.x_api_key) return; this._clipboard.copy(key.x_api_key); - notifyInfo(i18n('ADMIN.APP_KEYS_COPIED')); + notifySuccess(i18n('ADMIN.APP_KEYS_COPIED')); } } diff --git a/src/app/admin/database-details.component.ts b/src/app/admin/database-details.component.ts index 922ad9e52..35c18435e 100644 --- a/src/app/admin/database-details.component.ts +++ b/src/app/admin/database-details.component.ts @@ -15,6 +15,7 @@ import { readError } from '../common/errors'; import { downloadFile, jsonToCsv, parseCSV } from '../common/general'; import { notifyError, + notifyInfo, notifySuccess, notifyWarn, } from '../common/notifications'; @@ -289,7 +290,7 @@ export class PlaceDatabaseDetailsComponent this._watchMqttStatus(); } catch (err) { if ((err as Response)?.status === 409) { - notifyWarn('An MQTT re-sync is already running.'); + notifyInfo('An MQTT re-sync is already running.'); this._loadMqttStatus(); } else { notifyError( @@ -426,7 +427,7 @@ export class PlaceDatabaseDetailsComponent private async importZoneTree(zones: ZoneTreeExportItem[]) { if (!(zones instanceof Array) || !zones.length) { - notifyWarn('Invalid zone tree CSV file.'); + notifyError('Invalid zone tree CSV file.'); return; } const pending = zones.filter((zone) => !!zone.id); @@ -485,12 +486,12 @@ export class PlaceDatabaseDetailsComponent return; } const skipped = pending.length - created; - notifySuccess( - `Imported ${created} zones.${ - skipped - ? ` Skipped ${skipped} zones with circular parent ids.` - : '' - }`, - ); + if (skipped) { + notifyWarn( + `Imported ${created} zones. Skipped ${skipped} zones with circular parent ids.`, + ); + } else { + notifySuccess(`Imported ${created} zones.`); + } } } diff --git a/src/app/admin/details.component.ts b/src/app/admin/details.component.ts index b285cc026..3b287cf08 100644 --- a/src/app/admin/details.component.ts +++ b/src/app/admin/details.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, inject, signal } from '@angular/core'; import { apiEndpoint, get } from '@placeos/ts-client'; import { VERSION } from '../../env/version'; -import { notifyError, notifyInfo } from '../common/notifications'; +import { notifyError, notifySuccess } from '../common/notifications'; import { ChangelogModalComponent, ChangelogModalData, @@ -239,7 +239,7 @@ export class PlaceDetailsComponent implements OnInit { public copy(name: string, content: string) { copyToClipboard(content); - notifyInfo(i18n('ADMIN.COPIED', { name })); + notifySuccess(i18n('ADMIN.COPIED', { name })); } public async loadApiDetails() { diff --git a/src/app/admin/resource-imports.component.ts b/src/app/admin/resource-imports.component.ts index 643aa99aa..83a668b1d 100644 --- a/src/app/admin/resource-imports.component.ts +++ b/src/app/admin/resource-imports.component.ts @@ -8,8 +8,8 @@ import { escapeHtml } from '../common/general'; import { i18n } from '../common/locale.service'; import { notifyError, + notifyInfo, notifySuccess, - notifyWarn, } from '../common/notifications'; import { collectPages } from '../common/support-access'; import { openConfirmModal } from '../overlays/confirm-modal.component'; @@ -208,7 +208,7 @@ export class ResourceImportsComponent implements OnInit { const list = this.resource_list(); const missing = list.filter((_) => !_.imported); if (!missing.length) { - return notifyWarn(i18n('ADMIN.RESOURCE_IMPORTS_ALL_WARNING')); + return notifyInfo(i18n('ADMIN.RESOURCE_IMPORTS_ALL_WARNING')); } const resp = await openConfirmModal( { diff --git a/src/app/admin/upload-library.component.ts b/src/app/admin/upload-library.component.ts index b76098651..a991c86b1 100644 --- a/src/app/admin/upload-library.component.ts +++ b/src/app/admin/upload-library.component.ts @@ -15,11 +15,7 @@ import { AsyncHandler } from '../common/async-handler.class'; import { readError } from '../common/errors'; import { escapeHtml } from '../common/general'; import { i18n } from '../common/locale.service'; -import { - notifyError, - notifyInfo, - notifySuccess, -} from '../common/notifications'; +import { notifyError, notifySuccess } from '../common/notifications'; import { UploadsService } from '../common/uploads.service'; import { confirmAndRun } from '../overlays/confirm-modal.component'; import { FormFieldComponent } from '../ui/controls/form-field.component'; @@ -337,7 +333,7 @@ export class UploadLibraryComponent extends AsyncHandler implements OnInit { this._clipboard.copy( `${location.protocol}//${location.host}/api/engine/v2/uploads/${upload.id}/url`, ); - notifyInfo(`Copied upload URL to clipboard.`); + notifySuccess(`Copied upload URL to clipboard.`); } /** Upload the image to the cloud */ diff --git a/src/app/common/notifications.ts b/src/app/common/notifications.ts index e1cd927bf..fe509ace2 100644 --- a/src/app/common/notifications.ts +++ b/src/app/common/notifications.ts @@ -11,6 +11,14 @@ export interface Toast { on_action: () => void; } +/* + * Which toast to use: + * - `notifySuccess`: the action the user asked for is done, e.g. saved or copied + * - `notifyInfo`: nothing changed or there is nothing to do, e.g. no update available + * - `notifyWarn`: the action is done, but with a problem the user must know about + * - `notifyError`: the action failed or was stopped + */ + /** Most toasts on screen at once. Older toasts are removed first */ export const MAX_TOASTS = 3; /** Time a toast stays on screen. Errors stay until dismissed */ diff --git a/src/app/domains/domain-applications.component.ts b/src/app/domains/domain-applications.component.ts index 234af44cb..bf4dbea40 100644 --- a/src/app/domains/domain-applications.component.ts +++ b/src/app/domains/domain-applications.component.ts @@ -3,7 +3,7 @@ import { PlaceApplication, PlaceDomain } from '@placeos/ts-client'; import { copyToClipboard } from '../common/general'; import { i18n } from '../common/locale.service'; -import { notifyInfo } from '../common/notifications'; +import { notifySuccess } from '../common/notifications'; import { HashMap } from '../common/types'; import { ProgressBarComponent } from '../ui/controls/progress-bar.component'; import { TooltipDirective } from '../ui/controls/tooltip.directive'; @@ -220,7 +220,7 @@ export class DomainApplicationsComponent { public copySecret(item: PlaceApplication) { this.setShowSecret(item.id, false); copyToClipboard(item.secret); - notifyInfo(i18n('DOMAINS.COPIED_SECRET')); + notifySuccess(i18n('DOMAINS.COPIED_SECRET')); } public setShowSecret(id: string, value: boolean): void { diff --git a/src/app/domains/domain-form.component.ts b/src/app/domains/domain-form.component.ts index 977396b69..0b0efbdee 100644 --- a/src/app/domains/domain-form.component.ts +++ b/src/app/domains/domain-form.component.ts @@ -4,7 +4,7 @@ import { form, FormField } from '@angular/forms/signals'; import { addDomain, PlaceDomain, updateDomain } from '@placeos/ts-client'; import { mergeFormItem, onSaveHotkey, submitFormDialog } from '../common/forms'; import { i18n } from '../common/locale.service'; -import { notifyWarn } from '../common/notifications'; +import { notifyError } from '../common/notifications'; import { DialogEvent } from '../common/types'; import { isValidDomain } from '../common/validation'; import { ChipListComponent } from '../ui/controls/chip-list.component'; @@ -224,14 +224,14 @@ export class DomainFormComponent { /** * Update the email domains from the chip list. - * New items that are not valid domains are dropped with a warning. + * New items that are not valid domains are dropped with an error. */ public setEmailDomains(list: string[]) { const current = this.formModel().email_domains; const email_domains = list.filter( (item) => current.includes(item) || isValidDomain(item), ); - if (email_domains.length < list.length) notifyWarn('Invalid email'); + if (email_domains.length < list.length) notifyError('Invalid email'); this.formModel.update((value) => ({ ...value, email_domains })); } diff --git a/src/app/drivers/driver-about.component.ts b/src/app/drivers/driver-about.component.ts index 856c81e5a..017ff2b98 100644 --- a/src/app/drivers/driver-about.component.ts +++ b/src/app/drivers/driver-about.component.ts @@ -3,7 +3,7 @@ import { AsyncPipe } from '@angular/common'; import { Component, inject } from '@angular/core'; import { RouterModule } from '@angular/router'; import { i18n } from '../common/locale.service'; -import { notifyInfo } from '../common/notifications'; +import { notifySuccess } from '../common/notifications'; import { SpinnerComponent } from '../ui/controls/spinner.component'; import { TooltipDirective } from '../ui/controls/tooltip.directive'; import { SettingsFormComponent } from '../ui/forms/settings-form.component'; @@ -202,6 +202,6 @@ export class DriverAboutComponent { public readonly item = this._service.item; public copyCommit(): void { this._clipboard.copy(this.item()?.commit || ''); - notifyInfo(i18n('COMMON.COMMIT_HASH_COPIED')); + notifySuccess(i18n('COMMON.COMMIT_HASH_COPIED')); } } diff --git a/src/app/drivers/driver-state.service.ts b/src/app/drivers/driver-state.service.ts index 89f0e1d44..224a2d99d 100644 --- a/src/app/drivers/driver-state.service.ts +++ b/src/app/drivers/driver-state.service.ts @@ -14,7 +14,11 @@ import { import { describeError } from '../common/errors'; import { ActiveItemService } from '../common/item.service'; import { reportLoadError } from '../common/load-error'; -import { notifyError, notifySuccess } from '../common/notifications'; +import { + notifyError, + notifyInfo, + notifySuccess, +} from '../common/notifications'; import { collectPages } from '../common/support-access'; import { Identity } from '../common/types'; import { openConfirmModal } from '../overlays/confirm-modal.component'; @@ -92,7 +96,7 @@ export class DriverStateService { public async updateDriver() { const item = this._state.active_item as PlaceDriver; - if (!item.update_available) return notifyError('No update available.'); + if (!item.update_available) return notifyInfo('No update available.'); const details = await openConfirmModal( { title: `Update Driver`, diff --git a/src/app/overlays/bulk-item-modal/bulk-item-modal.component.ts b/src/app/overlays/bulk-item-modal/bulk-item-modal.component.ts index d9e2c8bac..8c1bb976d 100644 --- a/src/app/overlays/bulk-item-modal/bulk-item-modal.component.ts +++ b/src/app/overlays/bulk-item-modal/bulk-item-modal.component.ts @@ -226,7 +226,7 @@ export class BulkItemModalComponent< */ public handleList(data: HashMap[], is_mapped = false): void { if (!data.length) { - notifyWarn('No rows were found in the uploaded file.'); + notifyError('No rows were found in the uploaded file.'); return; } if (is_mapped) { diff --git a/src/app/overlays/bulk-item-modal/csv-upload.component.ts b/src/app/overlays/bulk-item-modal/csv-upload.component.ts index 46bd39556..c28715808 100644 --- a/src/app/overlays/bulk-item-modal/csv-upload.component.ts +++ b/src/app/overlays/bulk-item-modal/csv-upload.component.ts @@ -1,7 +1,7 @@ import { Component, input, output, signal } from '@angular/core'; import { downloadFile, jsonToCsv, parseCSV } from '../../common/general'; -import { notifyError, notifyWarn } from '../../common/notifications'; +import { notifyError } from '../../common/notifications'; import { HashMap } from '../../common/types'; import { SpinnerComponent } from '../../ui/controls/spinner.component'; import { IconComponent } from '../../ui/icon.component'; @@ -152,7 +152,7 @@ export class CsvUploadComponent { const list = parseCSV(data, seperator) || []; this.loading = false; if (!list.length) { - notifyWarn('No rows were found in the uploaded file.'); + notifyError('No rows were found in the uploaded file.'); return; } this.list.emit(list); diff --git a/src/app/overlays/confirm-modal.component.ts b/src/app/overlays/confirm-modal.component.ts index 1b467c486..90d78aaf3 100644 --- a/src/app/overlays/confirm-modal.component.ts +++ b/src/app/overlays/confirm-modal.component.ts @@ -14,11 +14,7 @@ import { DIALOG_DATA, Dialog, DialogRef } from '@angular/cdk/dialog'; import { lastValueFrom } from 'rxjs'; import { describeError, readError } from '../common/errors'; import { i18n } from '../common/locale.service'; -import { - notifyError, - notifyInfo, - notifySuccess, -} from '../common/notifications'; +import { notifyError, notifySuccess } from '../common/notifications'; import { waitForEvent } from '../common/signals'; import { ApplicationIcon, DialogEvent } from '../common/types'; import { DialogCloseDirective } from '../ui/controls/dialog'; @@ -594,7 +590,7 @@ export class ConfirmModalComponent implements OnInit { /** Copy a single resource id to the clipboard */ public copyId(id: string) { this._clipboard.copy(id); - notifyInfo(i18n('COMMON.COPIED_ID')); + notifySuccess(i18n('COMMON.COPIED_ID')); } /** Copy the whole receipt as TSV, for pasting into a ticket */ @@ -606,7 +602,7 @@ export class ConfirmModalComponent implements OnInit { (receipt.failed || []).length + (receipt.skipped || []).length; this._clipboard.copy(receiptToTsv(receipt)); - notifyInfo(i18n('CASCADE.RECEIPT_COPIED', { count }, count)); + notifySuccess(i18n('CASCADE.RECEIPT_COPIED', { count }, count)); } /** User confirmation of the content of the modal */ diff --git a/src/app/systems/system-triggers.component.ts b/src/app/systems/system-triggers.component.ts index 11447324a..858f04151 100644 --- a/src/app/systems/system-triggers.component.ts +++ b/src/app/systems/system-triggers.component.ts @@ -1,7 +1,7 @@ import { Component, computed, inject, model } from '@angular/core'; import { PlaceTrigger } from '@placeos/ts-client'; import { copyToClipboard, unique } from '../common/general'; -import { notifyInfo } from '../common/notifications'; +import { notifySuccess } from '../common/notifications'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; @@ -248,7 +248,7 @@ export class SystemTriggersComponent { copyToClipboard( `${location.origin}/api/engine/v2/webhook/${t.id}/notify?secret=${t.webhook_secret}`, ); - notifyInfo(i18n('SYSTEMS.COPIED_WEBHOOK')); + notifySuccess(i18n('SYSTEMS.COPIED_WEBHOOK')); }; // The service reloads the trigger list after each change public readonly editTrigger = (t) => this._service.editTrigger(t); diff --git a/src/app/ui/controls/toast-outlet.component.ts b/src/app/ui/controls/toast-outlet.component.ts index a1fc4d348..f6d58298a 100644 --- a/src/app/ui/controls/toast-outlet.component.ts +++ b/src/app/ui/controls/toast-outlet.component.ts @@ -12,6 +12,18 @@ import { ViewContainerRef, } from '@angular/core'; import { dismissToast, Toast, toasts } from '../../common/notifications'; +import { ApplicationIcon } from '../../common/types'; +import { IconComponent } from '../icon.component'; + +/** Icon for each toast type. Other types use the info icon */ +const TOAST_ICONS: Readonly> = { + success: { content: 'done' }, + info: { content: 'info' }, + error: { content: 'error' }, + warn: { content: 'warning' }, + warning: { content: 'warning' }, + pending: { content: 'pending' }, +}; /** * Shows the toasts made with `notify()` and its variants. @@ -32,6 +44,9 @@ import { dismissToast, Toast, toasts } from '../../common/notifications'; [class]="toast.type" animate.leave="toast-leave" > +
+ +
{{ toast.message }} @if (toast.action) {