diff --git a/.cspell.json b/.cspell.json index 64d65a6dd21..ac11a3fefd1 100644 --- a/.cspell.json +++ b/.cspell.json @@ -408,7 +408,10 @@ "SCALEWAY", "VULTR", "Codegen", - "icns" + "icns", + "pantone" + "openai", + "OPENAI" ], "useGitignore": true, "ignorePaths": [ diff --git a/.github/workflows/deploy-render-demo.yml b/.github/workflows/deploy-render-demo.yml index 8b52e977d0a..a17117e8102 100644 --- a/.github/workflows/deploy-render-demo.yml +++ b/.github/workflows/deploy-render-demo.yml @@ -3,7 +3,7 @@ name: Deploy to Render Demo on: workflow_run: workflows: ['Build and Publish Docker Images Demo'] - branches: [develop, temp] + branches: [render] types: - completed diff --git a/apps/desktop-timer/src/index.ts b/apps/desktop-timer/src/index.ts index 0538b7750a2..be90885441b 100644 --- a/apps/desktop-timer/src/index.ts +++ b/apps/desktop-timer/src/index.ts @@ -391,9 +391,13 @@ app.on('ready', async () => { API_BASE_URL: getApiBaseUrl(configs || {}), IS_INTEGRATED_DESKTOP: configs?.isLocalServer, }; - splashScreen = new SplashScreen(pathWindow.timeTrackerUi); - await splashScreen.loadURL(); - splashScreen.show(); + try { + splashScreen = new SplashScreen(pathWindow.timeTrackerUi); + await splashScreen.loadURL(); + splashScreen.show(); + } catch (error) { + console.error(error); + } if (!settings) { launchAtStartup(true, false); } diff --git a/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts b/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts index 72c65f3b884..e6bc0ea4fc3 100644 --- a/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts +++ b/apps/gauzy/src/app/@core/services/gauzy-ai/gauzy-ai.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs/internal/Observable'; -import { IIntegrationKeySecretPairInput, IIntegrationTenant } from '@gauzy/contracts'; +import { IIntegrationAICreateInput, IIntegrationTenant } from '@gauzy/contracts'; import { API_PREFIX } from '../../constants'; @Injectable({ @@ -18,7 +18,7 @@ export class GauzyAIService { * @param input * @returns */ - addIntegration(input: IIntegrationKeySecretPairInput): Observable { + create(input: IIntegrationAICreateInput): Observable { return this._http.post(`${API_PREFIX}/integration/gauzy-ai`, input); } } diff --git a/apps/gauzy/src/app/@core/services/integrations.service.ts b/apps/gauzy/src/app/@core/services/integrations.service.ts index ed638c253e0..2fefedf3399 100644 --- a/apps/gauzy/src/app/@core/services/integrations.service.ts +++ b/apps/gauzy/src/app/@core/services/integrations.service.ts @@ -71,16 +71,17 @@ export class IntegrationsService { } /** + * Get an IntegrationTenant by ID with optional relations. * - * @param integrationId - * @param relations - * @returns + * @param id - The ID of the IntegrationTenant. + * @param relations - Optional relations for the request. + * @returns {Observable} An Observable of the HTTP response. */ - fetchIntegrationTenant( - integrationId: IIntegrationTenant['id'], + getIntegrationTenant( + id: IIntegrationTenant['id'], relations: IBaseRelationsEntityModel - ) { - return this._http.get(`${API_PREFIX}/integration-tenant/${integrationId}`, { + ): Observable { + return this._http.get(`${API_PREFIX}/integration-tenant/${id}`, { params: toParams({ ...relations }) }); } diff --git a/apps/gauzy/src/app/@shared/directives/index.ts b/apps/gauzy/src/app/@shared/directives/index.ts index bddabe95279..162dd9daa19 100755 --- a/apps/gauzy/src/app/@shared/directives/index.ts +++ b/apps/gauzy/src/app/@shared/directives/index.ts @@ -6,6 +6,7 @@ import { UnderConstructionDirective } from './under-construction.directive'; import { ReadMoreDirective } from './read-more'; import { TimeTrackingAuthorizedDirective } from './time-tracking-authorized-directive'; import { NoSpaceEdgesDirective } from './no-space-edges.directive'; +import { TextMaskDirective } from './text-mask.directive'; export const DIRECTIVES = [ AutocompleteOffDirective, @@ -16,4 +17,5 @@ export const DIRECTIVES = [ OutsideDirective, UnderConstructionDirective, NoSpaceEdgesDirective, + TextMaskDirective ]; diff --git a/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts b/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts new file mode 100644 index 00000000000..73788bbed9b --- /dev/null +++ b/apps/gauzy/src/app/@shared/directives/text-mask.directive.ts @@ -0,0 +1,69 @@ +import { Directive, ElementRef, Renderer2, Input } from '@angular/core'; + +// Interface representing the configuration for text masking +interface IMaskConfig { + text: string; + showOriginal: boolean; + replacement: number; +} + +@Directive({ + selector: '[gaTextMask]' +}) +export class TextMaskDirective { + // Default configuration for text masking + private readonly _config: IMaskConfig = { + text: '', + showOriginal: false, + replacement: 0.5 + }; + + // Constructor to inject dependencies + constructor( + private readonly el: ElementRef, + private readonly renderer: Renderer2 + ) { } + + // Apply the configured text mask to the element + private applyTextMask(): void { + // Get the text based on the showOriginal configuration + const text = this.config.showOriginal ? this.config.text : this.maskText(this.config.text); + + // Set the masked or original text to the element's inner text + this.renderer.setProperty(this.el.nativeElement, 'innerText', text); + } + + // Mask the given text based on the configured replacement percentage + private maskText(value: string): string { + // If text is not provided, return an empty string + if (!value) { + return ''; + } + + // Convert the text into an array of characters + const text = value.split(''); + + // Replace the specified percentage of characters with asterisks ('*') + for (let i = 0; i < Math.floor(this.config.replacement * text.length); i++) { + text[i] = '*'; + } + + // Join the array back into a string and return the masked text + return text.join(''); + } + + // Getter for the current configuration + public get config(): IMaskConfig { + return this._config; + } + + // Setter for updating the configuration and applying the text mask + @Input() + public set config(partialConfig: Partial) { + // Merge the provided partial configuration with the default configuration + Object.assign(this._config, partialConfig); + + // Apply the text mask with the updated configuration + this.applyTextMask(); + } +} diff --git a/apps/gauzy/src/app/@shared/gallery/gallery.component.html b/apps/gauzy/src/app/@shared/gallery/gallery.component.html index df3bb782ecd..26eee4c0943 100755 --- a/apps/gauzy/src/app/@shared/gallery/gallery.component.html +++ b/apps/gauzy/src/app/@shared/gallery/gallery.component.html @@ -2,7 +2,17 @@
- + +
diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts index d4779c31b29..4fd738acfca 100644 --- a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts +++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.component.ts @@ -16,11 +16,11 @@ import { import { NbDialogService } from '@nebular/theme'; import { filter, take, tap } from 'rxjs/operators'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; +import { sortBy } from 'underscore'; import { TimesheetService } from '../../timesheet.service'; import { GalleryItem } from '../../../gallery/gallery.directive'; import { distinctUntilChange, progressStatus, toLocal } from '@gauzy/common-angular'; import { ViewScreenshotsModalComponent } from '../view-screenshots-modal/view-screenshots-modal.component'; -import * as _ from 'underscore'; import { GalleryService } from '../../../gallery/gallery.service'; import { DEFAULT_SVG } from './../../../../@core/constants/app.constants'; import { ErrorHandlingService, Store, ToastrService } from './../../../../@core/services'; @@ -32,7 +32,7 @@ import { ErrorHandlingService, Store, ToastrService } from './../../../../@core/ styleUrls: ['./screenshots-item.component.scss'] }) export class ScreenshotsItemComponent implements OnInit, OnDestroy { - + public organization: IOrganization; progressStatus = progressStatus; fallbackSvg = DEFAULT_SVG; @@ -65,20 +65,27 @@ export class ScreenshotsItemComponent implements OnInit, OnDestroy { } @Input() set timeSlot(timeSlot: ITimeSlot) { if (timeSlot) { + // Create a deep copy of the screenshots to avoid modifying the original array let screenshots = JSON.parse(JSON.stringify(timeSlot.screenshots)); - this.screenshots = screenshots.map((screenshot: IScreenshot) => { - return { - employeeId: timeSlot.employeeId, - ...screenshot - } - }); + + // Map each screenshot with additional properties and employeeId + this.screenshots = screenshots.map((screenshot: IScreenshot) => ({ + employeeId: timeSlot.employeeId, + ...screenshot + })); + + // Assign a new object to _timeSlot with modified properties this._timeSlot = Object.assign({}, timeSlot, { localStartedAt: toLocal(timeSlot.startedAt).toDate(), localStoppedAt: toLocal(timeSlot.stoppedAt).toDate(), isAllowDelete: this.isEnableDelete(timeSlot), screenshots: this.screenshots }); - screenshots = _.sortBy(screenshots, 'recordedAt').reverse(); + + // Sort screenshots by recordedAt in descending order + screenshots = sortBy(screenshots, 'recordedAt').reverse(); + + // Update lastScreenshot with the first screenshot if available if (screenshots.length) { const [last] = screenshots; this.lastScreenshot = last; @@ -115,7 +122,7 @@ export class ScreenshotsItemComponent implements OnInit, OnDestroy { private readonly toastrService: ToastrService, private readonly errorHandler: ErrorHandlingService, private readonly store: Store - ) {} + ) { } ngOnInit(): void { this.store.selectedOrganization$ @@ -135,75 +142,80 @@ export class ScreenshotsItemComponent implements OnInit, OnDestroy { } } - deleteSlot(timeSlot: ITimeSlot) { + /** + * Deletes a time slot if deletion is allowed and handles related tasks. + * + * @param timeSlot - The time slot to be deleted. + */ + async deleteSlot(timeSlot: ITimeSlot): Promise { if (!timeSlot.isAllowDelete) { return; } + try { const { id: organizationId } = this.organization; const request = { ids: [timeSlot.id], organizationId + }; + + // Delete time slots + await this.timesheetService.deleteTimeSlots(request); + + // Remove related screenshots from the gallery + const screenshots = this._screenshots.map(({ thumbUrl, fullUrl, ...screenshot }) => ({ + thumbUrl, + fullUrl, + ...screenshot + })); + this.galleryService.removeGalleryItems(screenshots); + + // Display success message + const { employee } = timeSlot; + if (employee && employee.fullName) { + this.toastrService.success('TOASTR.MESSAGE.SCREENSHOT_DELETED', { + name: employee.fullName.trim(), + organization: this.organization.name + }); } - this.timesheetService.deleteTimeSlots(request).then(() => { - const screenshots = this._screenshots.map( - (screenshot: IScreenshot) => { - return { - thumbUrl: screenshot.thumbUrl, - fullUrl: screenshot.fullUrl, - ...screenshot - }; - } - ); - this.galleryService.removeGalleryItems(screenshots); - - const { employee } = timeSlot; - if (employee && employee.fullName) { - this.toastrService.success('TOASTR.MESSAGE.SCREENSHOT_DELETED', { - name: `${employee.fullName.trim()}`, - organization: this.organization.name - }); - } - this.delete.emit(); - }); + + // Trigger delete event + this.delete.emit(); } catch (error) { this.errorHandler.handleError(error); } } /** - * View Time Slot Info - * - * @param timeSlot + * Opens a modal to view information about the provided time slot. + * + * @param timeSlot - The time slot for which information is to be viewed. */ - viewInfo(timeSlot: ITimeSlot) { + viewInfo(timeSlot: ITimeSlot): void { this.nbDialogService.open(ViewScreenshotsModalComponent, { - context: { + context: { timeSlot, timeLogs: timeSlot.timeLogs } }) - .onClose - .pipe( - filter(Boolean), - tap((data) => { - if (data && data['isDelete']) { - this.delete.emit(); - } - }), - take(1), - untilDestroyed(this) - ) - .subscribe(); + .onClose.pipe( + filter(data => Boolean(data && data['isDelete'])), + tap(() => this.delete.emit()), + take(1), + untilDestroyed(this) + ) + .subscribe(); } + /** + * Checks if the provided time slot can be deleted based on certain conditions. + * + * @param timeSlot - The time slot to be checked for deletion. + * @returns True if deletion is allowed, false otherwise. + */ isEnableDelete(timeSlot: ITimeSlot): boolean { - let isAllow: boolean = true; - if (timeSlot.timeLogs.length > 0) { - isAllow = !timeSlot.timeLogs.find((log: ITimeLog) => log.isRunning); - } - return isAllow; + return timeSlot.timeLogs.every((log: ITimeLog) => !log.isRunning); } - ngOnDestroy(): void {} + ngOnDestroy(): void { } } diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts index a5219376176..1424377a37f 100644 --- a/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts +++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/screenshots-item/screenshots-item.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NbButtonModule, NbDialogModule, @@ -7,27 +8,25 @@ import { NbCheckboxModule, NbProgressBarModule, NbPopoverModule, - NbListModule + NbListModule, + NbTooltipModule } from '@nebular/theme'; -import { ScreenshotsItemComponent } from './screenshots-item.component'; -import { SharedModule } from '../../../shared.module'; -import { TranslateModule } from '@ngx-translate/core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MomentModule } from 'ngx-moment'; import { GalleryModule } from '../../../gallery/gallery.module'; -import { DialogsModule } from '../../../dialogs'; +import { DialogsModule } from '../../../dialogs/dialogs.module'; import { ViewScreenshotsModalModule } from '../view-screenshots-modal/view-screenshots-modal.module'; -import { TableComponentsModule } from '../../../table-components'; +import { TableComponentsModule } from '../../../table-components/table-components.module'; +import { SharedModule } from '../../../shared.module'; +import { TranslateModule } from '../../../translate/translate.module'; +import { ScreenshotsItemComponent } from './screenshots-item.component'; @NgModule({ declarations: [ScreenshotsItemComponent], exports: [ScreenshotsItemComponent], imports: [ CommonModule, - DialogsModule, FormsModule, - GalleryModule, - MomentModule, + ReactiveFormsModule, NbButtonModule, NbCheckboxModule, NbDialogModule.forChild(), @@ -35,11 +34,14 @@ import { TableComponentsModule } from '../../../table-components'; NbListModule, NbPopoverModule, NbProgressBarModule, - ReactiveFormsModule, + NbTooltipModule, + MomentModule, + TranslateModule, SharedModule, + DialogsModule, + GalleryModule, TableComponentsModule, - TranslateModule, ViewScreenshotsModalModule ] }) -export class ScreenshotsItemModule {} +export class ScreenshotsItemModule { } diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html index 14d15ec3c6d..b01ff950225 100644 --- a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html +++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.html @@ -41,11 +41,19 @@
{{ 'TIMESHEET.SCREENSHOTS.SCREENSHOTS' | translate }}
- + +
{{ image?.recordedAt | dateTimeFormat }} diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts index ccde0f75919..d4979e65454 100644 --- a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts +++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.component.ts @@ -29,18 +29,31 @@ export class ViewScreenshotsModalComponent implements OnInit { get timeSlot(): ITimeSlot { return this._timeSlot; } + /** + * Setter for the timeSlot property. Assigns the provided timeSlot value, processes + * and formats the screenshots, and updates the local _timeSlot property accordingly. + * + * @param timeSlot - The TimeSlot object to be assigned. + */ @Input() set timeSlot(timeSlot: ITimeSlot) { - let screenshots = JSON.parse(JSON.stringify(timeSlot.screenshots)); - this.screenshots = sortBy(screenshots, 'recordedAt').map((screenshot: IScreenshot) => { - return { + if (timeSlot) { + // Destructure the timeSlot object + const { ...restTimeSlot } = timeSlot; + const screenshots = JSON.parse(JSON.stringify(timeSlot.screenshots)); + + // Process and format the screenshots array + this.screenshots = sortBy(screenshots, 'recordedAt').map((screenshot: IScreenshot) => ({ employee: timeSlot.employee, ...screenshot - } - }); - this._timeSlot = Object.assign({}, timeSlot, { - localStartedAt: toLocal(timeSlot.startedAt).toDate(), - localStoppedAt: toLocal(timeSlot.stoppedAt).toDate() - }); + })); + + // Update the _timeSlot object with formatted timestamps and other properties + this._timeSlot = { + ...restTimeSlot, + localStartedAt: toLocal(timeSlot.startedAt).toDate(), + localStoppedAt: toLocal(timeSlot.stoppedAt).toDate() + }; + } } /* @@ -64,13 +77,14 @@ export class ViewScreenshotsModalComponent implements OnInit { @Input() set timeLogs(timeLogs: ITimeLog[]) { this._timeLogs = sortBy(timeLogs, 'recordedAt'); } + constructor( private readonly store: Store, private readonly dialogRef: NbDialogRef, private readonly timesheetService: TimesheetService, private readonly nbDialogService: NbDialogService, private readonly toastrService: ToastrService - ) {} + ) { } ngOnInit(): void { this.store.selectedOrganization$ @@ -83,99 +97,132 @@ export class ViewScreenshotsModalComponent implements OnInit { .subscribe(); } - async getTimeSlot() { + /** + * Asynchronously retrieves and sets the time slot and associated time logs. + * + * @returns A Promise that resolves when the operation is complete. + */ + async getTimeSlot(): Promise { try { + // Check if organization and time slot are available + if (!this.organization || !this.timeSlot) { + return; + } + + // Retrieve time slot with specified relations this.timeSlot = await this.timesheetService.getTimeSlot(this.timeSlot.id, { relations: [ 'employee.user', 'screenshots', - 'timeLogs', 'timeLogs.project', 'timeLogs.task', 'timeLogs.organizationContact', 'timeLogs.employee.user', - ] + ], }); + + // Set the time logs property to the time logs of the retrieved time slot this.timeLogs = this.timeSlot.timeLogs; } catch (error) { - console.log('Error while retrieve TimeSlot:', error); + // Handle errors by logging and displaying a toastr message + console.error('Error while retrieving TimeSlot:', error); this.toastrService.danger(error); } } - close() { + /** + * Closes the current dialog. + */ + close(): void { this.dialogRef.close(); } - viewTimeLog(timeLog: ITimeLog) { + /** + * Opens a modal to view details of a time log. + * + * @param timeLog - The time log to be viewed. + */ + viewTimeLog(timeLog: ITimeLog): void { this.nbDialogService.open(ViewTimeLogModalComponent, { - context: { timeLog } + context: { timeLog }, }); } /** - * DELETE specific Screenshot + * Deletes a specific screenshot associated with an employee. * - * @param screenshot - * @param employee - * @returns + * @param screenshot - The screenshot to be deleted. + * @param employee - The employee associated with the screenshot. + * @returns void */ - async deleteImage( - screenshot: IScreenshot, - employee: IEmployee - ) { + async deleteImage(screenshot: IScreenshot, employee: IEmployee): Promise { if (!screenshot || !this.organization) { return; } + try { const { name } = this.organization; const { organizationId, tenantId } = screenshot; + // Delete the specified screenshot await this.timesheetService.deleteScreenshot(screenshot.id, { organizationId, tenantId - }).then(() => { - this.screenshots = this.screenshots.filter( - (item: IScreenshot) => item.id !== screenshot.id - ); }); + + // Remove the deleted screenshot from the local collection + this.screenshots = this.screenshots.filter( + (item: IScreenshot) => item.id !== screenshot.id + ); + + // Display success message this.toastrService.success('TOASTR.MESSAGE.SCREENSHOT_DELETED', { name: employee.fullName, organization: name }); } catch (error) { - console.log('Error while delete screenshot: ', error); + // Handle errors by logging and displaying a toastr message + console.error('Error while deleting screenshot:', error); this.toastrService.danger(error); } } /** - * DELETE specific TimeLog + * Deletes a specific time log associated with an employee. * - * @param timeLog + * @param timeLog - The time log to be deleted. + * @param employee - The employee associated with the time log. + * @returns void */ - async deleteTimeLog(timeLog: ITimeLog, employee: IEmployee) { + async deleteTimeLog(timeLog: ITimeLog, employee: IEmployee): Promise { if (timeLog.isRunning) { return; } + try { - const { id: organizationId } = this.organization; + const { id: organizationId, name: organizationName } = this.organization; const request = { logIds: [timeLog.id], organizationId - } - await this.timesheetService.deleteLogs(request).then(() => { - this.toastrService.success('TOASTR.MESSAGE.TIME_LOG_DELETED', { - name: employee.fullName, - organization: this.organization.name - }); - this.dialogRef.close({ - timeLog: timeLog, - isDelete: true - }); + }; + + // Delete the specified time log + await this.timesheetService.deleteLogs(request); + + // Display success message + this.toastrService.success('TOASTR.MESSAGE.TIME_LOG_DELETED', { + name: employee.fullName, + organization: organizationName + }); + + // Close the dialog and emit an event indicating time log deletion + this.dialogRef.close({ + timeLog: timeLog, + isDelete: true }); } catch (error) { - console.log('Error while delete TimeLog: ', error); + // Handle errors by logging and displaying a toastr message + console.error('Error while deleting TimeLog:', error); this.toastrService.danger(error); } } diff --git a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts index 5ccb34516fe..87993f88f91 100644 --- a/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts +++ b/apps/gauzy/src/app/@shared/timesheet/screenshots/view-screenshots-modal/view-screenshots-modal.module.ts @@ -1,21 +1,22 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ViewScreenshotsModalComponent } from './view-screenshots-modal.component'; import { NbDialogModule, NbCardModule, NbButtonModule, NbIconModule, NbProgressBarModule, - NbAlertModule + NbAlertModule, + NbTooltipModule } from '@nebular/theme'; -import { SharedModule } from '../../../shared.module'; import { MomentModule } from 'ngx-moment'; -import { TranslateModule } from '@ngx-translate/core'; +import { SharedModule } from '../../../shared.module'; import { LabelModule } from '../../../components/label/label.module'; import { GalleryModule } from '../../../gallery/gallery.module'; import { DialogsModule } from '../../../dialogs/dialogs.module'; -import { TableComponentsModule } from '../../../table-components'; +import { TranslateModule } from '../../../translate/translate.module'; +import { TableComponentsModule } from '../../../table-components/table-components.module'; +import { ViewScreenshotsModalComponent } from './view-screenshots-modal.component'; @NgModule({ declarations: [ViewScreenshotsModalComponent], @@ -23,13 +24,14 @@ import { TableComponentsModule } from '../../../table-components'; imports: [ CommonModule, NbAlertModule, - NbDialogModule.forChild(), - NbCardModule, NbButtonModule, + NbCardModule, + NbDialogModule.forChild(), NbIconModule, - SharedModule, NbProgressBarModule, + NbTooltipModule, MomentModule, + SharedModule, TranslateModule, LabelModule, GalleryModule, diff --git a/apps/gauzy/src/app/@theme/components/header/header.component.ts b/apps/gauzy/src/app/@theme/components/header/header.component.ts index 0788e367884..c23d61654b7 100644 --- a/apps/gauzy/src/app/@theme/components/header/header.component.ts +++ b/apps/gauzy/src/app/@theme/components/header/header.component.ts @@ -18,6 +18,7 @@ import { debounceTime, filter, tap } from 'rxjs/operators'; import { TranslateService } from '@ngx-translate/core'; import * as moment from 'moment'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; +import hotkeys, { HotkeysEvent } from 'hotkeys-js'; import { distinctUntilChange, isNotEmpty } from '@gauzy/common-angular'; import { CrudActionEnum, @@ -51,7 +52,6 @@ import { TranslationBaseComponent } from '../../../@shared/language-base'; import { ChangeDetectorRef } from '@angular/core'; import { OrganizationTeamStore } from '../../../@core/services/organization-team-store.service'; import { QuickActionsComponent } from '../../../@shared/dialogs/quick-actions/quick-actions.component'; -import hotkeys, { HotkeysEvent } from 'hotkeys-js'; @UntilDestroy({ checkProperties: true }) @Component({ @@ -242,11 +242,13 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit, }, (event: KeyboardEvent, handler: HotkeysEvent) => { const pressedKeys: string = this.pressedKeysToString(handler); + // -- prevent triggering shortcuts when typing in NbOptions (searchable inputs) + if ((event.target as Element).localName === "nb-option") return; if (this.shortcutsMap.has(pressedKeys)) { // -- close dialog if open when using shortcuts and prevent closing dialog by pressing unregistered keys this.quickActionsRef && - pressedKeys !== this.defaultShortcuts.quickActions.toLowerCase() && - this.shortcutsMap.has(pressedKeys) + pressedKeys !== this.defaultShortcuts.quickActions.toLowerCase() && + this.shortcutsMap.has(pressedKeys) ? this.quickActionsRef.close() : null; if (handler.scope === 'defaultShortcuts' && this.shortcutsMap.has(pressedKeys)) { @@ -269,7 +271,7 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit, private registerShortcut(keys: string, action: () => void) { this.shortcutsMap.set(keys.toLowerCase(), action); - hotkeys(keys, 'defaultShortcuts', () => {}); + hotkeys(keys, 'defaultShortcuts', () => { }); hotkeys.setScope('defaultShortcuts'); } @@ -321,14 +323,14 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit, }); } - private toggleQuickActionsDialog() { + /** + * Toggles the quick actions dialog, opening it if it's not open, and closing it if it's already open. + */ + private toggleQuickActionsDialog(): void { if (!this.quickActionsRef) { this.openQuickActions(); - return; - } - if (this.quickActionsRef) { + } else { this.quickActionsRef.close(); - return; } } @@ -618,521 +620,521 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit, // Divider (Accounting) ...(this.store.hasAnyPermission(PermissionsEnum.INVOICES_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INVOICE'), - icon: 'file-text-outline', - link: 'pages/accounting/invoices/add', - data: { - action: 'createInvoice' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createInvoice), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INVOICE'), + icon: 'file-text-outline', + link: 'pages/accounting/invoices/add', + data: { + action: 'createInvoice' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createInvoice), + status: 'control' } - ] + } + ] : []), ...(!!this.user.employee ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_INVOICES'), - icon: { - icon: 'file-invoice-dollar', - pack: 'font-awesome' - }, - link: 'pages/accounting/invoices/received-invoices', - data: { - action: 'receivedInvoices' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.receivedInvoices), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_INVOICES'), + icon: { + icon: 'file-invoice-dollar', + pack: 'font-awesome' + }, + link: 'pages/accounting/invoices/received-invoices', + data: { + action: 'receivedInvoices' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.receivedInvoices), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_INCOMES_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INCOME'), - icon: 'plus-circle-outline', - link: 'pages/accounting/income', - data: { - action: 'createIncome' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createIncome), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_INCOME'), + icon: 'plus-circle-outline', + link: 'pages/accounting/income', + data: { + action: 'createIncome' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createIncome), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_EXPENSES_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_EXPENSE'), - icon: 'minus-circle-outline', - link: 'pages/accounting/expenses', - data: { - action: 'createExpense' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createExpense), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_EXPENSE'), + icon: 'minus-circle-outline', + link: 'pages/accounting/expenses', + data: { + action: 'createExpense' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createExpense), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ESTIMATES_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_ESTIMATE'), - icon: 'file-outline', - link: 'pages/accounting/invoices/estimates/add', - data: { - action: 'createEstimate' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createEstimate), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_ESTIMATE'), + icon: 'file-outline', + link: 'pages/accounting/invoices/estimates/add', + data: { + action: 'createEstimate' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createEstimate), + status: 'control' } - ] + } + ] : []), ...(!!this.user.employee ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_ESTIMATES'), - icon: { - icon: 'file-invoice', - pack: 'font-awesome' - }, - link: 'pages/accounting/invoices/received-estimates', - data: { - action: 'receivedEstimates' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.receivedEstimates), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.RECEIVED_ESTIMATES'), + icon: { + icon: 'file-invoice', + pack: 'font-awesome' + }, + link: 'pages/accounting/invoices/received-estimates', + data: { + action: 'receivedEstimates' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.receivedEstimates), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_PAYMENT_ADD_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PAYMENT'), - icon: 'credit-card-outline', - link: 'pages/accounting/payments', - data: { - action: 'createPayment' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createPayment), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PAYMENT'), + icon: 'credit-card-outline', + link: 'pages/accounting/payments', + data: { + action: 'createPayment' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createPayment), + status: 'control' } - ] + } + ] : []), // Divider (Organization) ...(this.store.hasAnyPermission(PermissionsEnum.ORG_EMPLOYEES_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EMPLOYEE'), - icon: 'people-outline', - link: 'pages/employees', - data: { - action: 'addEmployee' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.addEmployee), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EMPLOYEE'), + icon: 'people-outline', + link: 'pages/employees', + data: { + action: 'addEmployee' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.addEmployee), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_INVENTORY_PRODUCT_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_INVENTORY'), - icon: 'inbox-outline', - link: 'pages/organization/inventory/create', - data: { - action: 'addInventory' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.addInventory), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_INVENTORY'), + icon: 'inbox-outline', + link: 'pages/organization/inventory/create', + data: { + action: 'addInventory' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.addInventory), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_EQUIPMENT_EDIT, PermissionsEnum.ALL_ORG_EDIT) || - !!this.user.employee + !!this.user.employee ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EQUIPMENT'), - icon: 'pantone-outline', - link: 'pages/organization/equipment', - data: { - action: 'addEquipment' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.addEquipment), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_EQUIPMENT'), + icon: 'pantone-outline', + link: 'pages/organization/equipment', + data: { + action: 'addEquipment' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.addEquipment), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_VENDOR'), - icon: 'car-outline', - link: 'pages/organization/vendors', - data: { - action: 'addVendor' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.addVendor), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_VENDOR'), + icon: 'car-outline', + link: 'pages/organization/vendors', + data: { + action: 'addVendor' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.addVendor), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_DEPARTMENT'), - icon: 'briefcase-outline', - link: 'pages/organization/departments', - data: { - action: 'addDepartment' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.addDepartment), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.ADD_DEPARTMENT'), + icon: 'briefcase-outline', + link: 'pages/organization/departments', + data: { + action: 'addDepartment' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.addDepartment), + status: 'control' } - ] + } + ] : []), // Divider (Project Management) ...(this.store.hasAnyPermission(PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TEAM'), - icon: 'people-outline', - link: 'pages/organization/teams', - data: { - action: 'createTeam' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createTeam), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TEAM'), + icon: 'people-outline', + link: 'pages/organization/teams', + data: { + action: 'createTeam' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createTeam), + status: 'control' } - ] + } + ] : []), ...(this.store.hasPermission(PermissionsEnum.ORG_TASK_ADD) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TASK'), - icon: 'archive-outline', - link: 'pages/tasks/dashboard', - data: { - action: 'createTask' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createTask), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_TASK'), + icon: 'archive-outline', + link: 'pages/tasks/dashboard', + data: { + action: 'createTask' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createTask), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_PROJECT_ADD, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROJECT'), - icon: 'color-palette-outline', - link: 'pages/organization/projects/create', - data: { - action: 'createProject' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createProject), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROJECT'), + icon: 'color-palette-outline', + link: 'pages/organization/projects/create', + data: { + action: 'createProject' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createProject), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_TASK_VIEW, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TASKS'), - icon: 'calendar-outline', - link: 'pages/tasks/dashboard', - data: { - action: 'viewTasks' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.viewTasks), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TASKS'), + icon: 'calendar-outline', + link: 'pages/tasks/dashboard', + data: { + action: 'viewTasks' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.viewTasks), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_TASK_VIEW, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TEAM_TASKS'), - icon: 'layers-outline', - link: 'pages/tasks/team', - data: { - action: 'viewTeamTasks' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.viewTeamTasks), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TEAM_TASKS'), + icon: 'layers-outline', + link: 'pages/tasks/team', + data: { + action: 'viewTeamTasks' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.viewTeamTasks), + status: 'control' } - ] + } + ] : []), // Divider (Jobs) ...(this.store.hasAnyPermission(PermissionsEnum.ORG_CANDIDATES_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CANDIDATE'), - icon: 'person-add-outline', - link: 'pages/employees/candidates', - data: { - action: 'createCandidate' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createCandidate), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CANDIDATE'), + icon: 'person-add-outline', + link: 'pages/employees/candidates', + data: { + action: 'createCandidate' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createCandidate), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_PROPOSALS_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROPOSAL'), - icon: 'paper-plane-outline', - link: 'pages/sales/proposals/register', - data: { - action: 'createProposal' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createProposal), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_PROPOSAL'), + icon: 'paper-plane-outline', + link: 'pages/sales/proposals/register', + data: { + action: 'createProposal' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createProposal), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTRACT_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CONTRACT'), - icon: 'file-text-outline', - link: 'pages/integrations/upwork', - data: { - action: 'createContract' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createContract), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CONTRACT'), + icon: 'file-text-outline', + link: 'pages/integrations/upwork', + data: { + action: 'createContract' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createContract), + status: 'control' } - ] + } + ] : []), // Divider (Contacts) ...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTACT_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_LEAD'), - icon: 'shield-outline', - link: 'pages/contacts/leads', - data: { - action: 'createLead' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createLead), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_LEAD'), + icon: 'shield-outline', + link: 'pages/contacts/leads', + data: { + action: 'createLead' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createLead), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTACT_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CUSTOMER'), - icon: 'person-done-outline', - link: 'pages/contacts/customers', - data: { - action: 'createCustomer' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createCustomer), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CUSTOMER'), + icon: 'person-done-outline', + link: 'pages/contacts/customers', + data: { + action: 'createCustomer' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createCustomer), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.ORG_CONTACT_EDIT, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CLIENT'), - icon: 'person-outline', - link: 'pages/contacts/clients', - data: { - action: 'createClient' - }, - queryParams: { - openAddDialog: true - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.createClient), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.CREATE_CLIENT'), + icon: 'person-outline', + link: 'pages/contacts/clients', + data: { + action: 'createClient' + }, + queryParams: { + openAddDialog: true + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.createClient), + status: 'control' } - ] + } + ] : []), ...(!!this.user.employee ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_CLIENTS'), - icon: 'person-outline', - link: 'pages/contacts/clients', - data: { - action: 'viewClients' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.viewClients), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_CLIENTS'), + icon: 'person-outline', + link: 'pages/contacts/clients', + data: { + action: 'viewClients' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.viewClients), + status: 'control' } - ] + } + ] : []), // Divider (Time Tracking) ...(this.store.hasAnyPermission(PermissionsEnum.TIMESHEET_EDIT_TIME, PermissionsEnum.ALL_ORG_EDIT) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.TIME_LOG'), - icon: 'clock-outline', - link: 'pages/employees/timesheets/daily', - data: { - action: 'timeLog' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.timeLog), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.TIME_LOG'), + icon: 'clock-outline', + link: 'pages/employees/timesheets/daily', + data: { + action: 'timeLog' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.timeLog), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.TIME_TRACKER) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_APPOINTMENTS'), - icon: 'calendar-outline', - link: 'pages/employees/appointments', - data: { - action: 'viewAppointments' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.viewAppointments), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_APPOINTMENTS'), + icon: 'calendar-outline', + link: 'pages/employees/appointments', + data: { + action: 'viewAppointments' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.viewAppointments), + status: 'control' } - ] + } + ] : []), ...(this.store.hasAnyPermission(PermissionsEnum.TIME_TRACKER) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TIME_ACTIVITY'), - icon: 'activity-outline', - link: 'pages/employees/activity/time-activities', - data: { - action: 'viewTimeActivity' - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.viewTimeActivity), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.VIEW_TIME_ACTIVITY'), + icon: 'activity-outline', + link: 'pages/employees/activity/time-activities', + data: { + action: 'viewTimeActivity' + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.viewTimeActivity), + status: 'control' } - ] + } + ] : []), ...(!!this.user.employee ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.START_TIMER'), - icon: 'play-circle-outline', - hidden: !this.isEmployee || this.isElectron, - data: { - action: this.actions.START_TIMER // -- Start the timer - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.startTimer), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.START_TIMER'), + icon: 'play-circle-outline', + hidden: !this.isEmployee || this.isElectron, + data: { + action: this.actions.START_TIMER // -- Start the timer + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.startTimer), + status: 'control' } - ] + } + ] : []), ...(!this.store.hasAnyPermission(PermissionsEnum.TIMESHEET_EDIT_TIME) ? [ - { - title: this.getTranslation('QUICK_ACTIONS_MENU.STOP_TIMER'), - icon: 'pause-circle-outline', - hidden: !this.isEmployee || this.isElectron, - data: { - action: this.actions.STOP_TIMER // -- Stop the timer - }, - badge: { - text: this.formatShortcut(this.defaultShortcuts.stopTimer), - status: 'control' - } + { + title: this.getTranslation('QUICK_ACTIONS_MENU.STOP_TIMER'), + icon: 'pause-circle-outline', + hidden: !this.isEmployee || this.isElectron, + data: { + action: this.actions.STOP_TIMER // -- Stop the timer + }, + badge: { + text: this.formatShortcut(this.defaultShortcuts.stopTimer), + status: 'control' } - ] + } + ] : []) ]; } @@ -1182,5 +1184,5 @@ export class HeaderComponent extends TranslationBaseComponent implements OnInit, this.isCollapse = event; } - ngOnDestroy() {} + ngOnDestroy() { } } diff --git a/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html b/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html index f5dfdae132d..f40cc39c597 100644 --- a/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html +++ b/apps/gauzy/src/app/auth/login-workspace/login-workspace.component.html @@ -9,7 +9,7 @@
-

Sign in to Workspace

+

{{ "WORKSPACES.SIGN_IN_TITLE" | translate }}

@@ -19,13 +19,13 @@

Sign in to Workspace

@@ -42,14 +42,14 @@

Sign in to Workspace

Sign in to Workspace
@@ -67,7 +67,7 @@

Sign in to Workspace

diff --git a/apps/gauzy/src/app/auth/login/login.component.html b/apps/gauzy/src/app/auth/login/login.component.html index 2e14547b8b9..f3444bc59c6 100644 --- a/apps/gauzy/src/app/auth/login/login.component.html +++ b/apps/gauzy/src/app/auth/login/login.component.html @@ -12,24 +12,38 @@

{{ 'LOGIN_PAGE.TITLE' | translate }}

-
Demo Credentials
+ + {{ "LOGIN_PAGE.DEMO.DEMO_TITLE" | translate }} + + {{ "LOGIN_PAGE.DEMO.CREDENTIALS_TITLE" | translate }}
-
Super Admin
+
{{ "LOGIN_PAGE.DEMO.SUPER_ADMIN_TITLE" | translate }}

-
Email: admin@ever.co
-
Password: admin
+
+ {{ "LOGIN_PAGE.DEMO.LABELS.EMAIL" | translate }} admin@ever.co +
+
+ {{ "LOGIN_PAGE.DEMO.LABELS.PASSWORD" | translate }} admin +

-
Admin
+
{{ "LOGIN_PAGE.DEMO.ADMIN_TITLE" | translate }}

-
Email: local.admin@ever.co
-
Password: admin
+
+ {{ "LOGIN_PAGE.DEMO.LABELS.EMAIL" | translate }} local.admin@ever.co +
+
+ {{ "LOGIN_PAGE.DEMO.LABELS.PASSWORD" | translate }} admin +

-
Employee
+
{{ "LOGIN_PAGE.DEMO.EMPLOYEE_TITLE" | translate }}

-
Email: employee@ever.co
-
Password: 123456
+
+ {{ "LOGIN_PAGE.DEMO.LABELS.EMAIL" | translate }} employee@ever.co
+
+ {{ "LOGIN_PAGE.DEMO.LABELS.PASSWORD" | translate }} 123456 +
@@ -234,8 +248,10 @@

{{ 'LOGIN_PAGE.TITLE' | translate }}

- Don’t know your workspace? - Find your workspaces + {{ "WORKSPACES.UNKNOWN_WORKSPACE" | translate }} + + {{ "WORKSPACES.FIND_WORKSPACE" | translate }} +
diff --git a/apps/gauzy/src/app/auth/register/register.component.html b/apps/gauzy/src/app/auth/register/register.component.html index d9f6ad3e2ac..0c8088b0403 100644 --- a/apps/gauzy/src/app/auth/register/register.component.html +++ b/apps/gauzy/src/app/auth/register/register.component.html @@ -5,7 +5,7 @@
-

Register

+

{{ "REGISTER_PAGE.TITLE" | translate }}

@@ -25,7 +25,7 @@

Register

Register #fullName="ngModel" id="input-name" name="fullName" - placeholder="Full name" + [placeholder]=" 'REGISTER_PAGE.PLACEHOLDERS.FULL_NAME' | translate " autofocus fullWidth fieldSize="large" @@ -43,25 +43,27 @@

Register

[maxlength]="getConfigValue('forms.validation.fullName.maxLength')" [attr.aria-invalid]=" fullName.invalid && fullName.touched ? true : null" autocomplete="full-name" - /> + />

- Full name is required! + {{ "REGISTER_PAGE.VALIDATIONS.FULL_NAME_REQUIRED" | translate }}

- Full name should contains from - {{ getConfigValue('forms.validation.fullName.minLength') }} to - {{ getConfigValue('forms.validation.fullName.maxLength') }} - characters + {{ "REGISTER_PAGE.VALIDATIONS.FULL_NAME_SHOULD_CONTAIN" | + translate : { + minLength: getConfigValue('forms.validation.fullName.minLength'), + maxLength: getConfigValue('forms.validation.fullName.maxLength') + } + }}

Register name="email" pattern=".+@.+..+" noSpaceEdges - placeholder="Email address" + [placeholder]="'REGISTER_PAGE.PLACEHOLDERS.EMAIL' | translate" fullWidth fieldSize="large" [status]=" email.dirty ? (email.invalid ? 'danger' : 'success') : 'basic'" @@ -81,16 +83,16 @@

Register

/>

- Email is required! + {{ "REGISTER_PAGE.VALIDATIONS.EMAIL_REQUIRED" | translate }}

- Email should be the real one! + {{ "REGISTER_PAGE.VALIDATIONS.EMAIL_SHOULD_BE_REAL" | translate }}

Register type="password" id="input-password" name="password" - placeholder="Password" + [placeholder]=" 'REGISTER_PAGE.PLACEHOLDERS.PASSWORD' | translate " fullWidth fieldSize="large" [status]="password.dirty ? password.invalid ? 'danger' : 'success' : 'basic'" @@ -122,22 +124,22 @@

Register

- Passwords must not begin or end with spaces. + {{ "REGISTER_PAGE.VALIDATIONS.PASSWORD_NO_SPACE_EDGES" | translate }}

- Password is required! + {{ "REGISTER_PAGE.VALIDATIONS.PASSWORD_REQUIRED" | translate }}

- Password should contain from - {{ getConfigValue('forms.validation.password.minLength') }} to - {{ getConfigValue('forms.validation.password.maxLength') }} - characters + {{ "REGISTER_PAGE.VALIDATIONS.PASSWORD_SHOULD_CONTAIN" | translate : { + minLength: getConfigValue('forms.validation.password.minLength'), + maxLength: getConfigValue('forms.validation.password.maxLength') + } }}

Register type="password" id="input-re-password" name="rePass" - placeholder="Confirm Password" + [placeholder]=" 'REGISTER_PAGE.PLACEHOLDERS.CONFIRM_PASSWORD' | translate" fullWidth fieldSize="large" [status]="confirmPassword.dirty ? confirmPassword.invalid || password.value != confirmPassword.value ? 'danger' : 'success' : 'basic' " @@ -166,10 +168,10 @@

Register

- Password confirmation is required! + {{ "REGISTER_PAGE.VALIDATIONS.CONFIRM_PASSWORD_REQUIRED" | translate }}

- Password does not match the confirm password. + {{ "REGISTER_PAGE.VALIDATIONS.PASSWORDS_NOT_MATCH" | translate }}

@@ -181,13 +183,21 @@

Register

[(ngModel)]="user.terms" [required]="getConfigValue('forms.register.terms')" > - Agree to + + {{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.AGREE_TO" | translate }} + - Terms & Conditions + + {{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.TERMS_AND_CONDITIONS" | translate }} + - and + + {{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.AND" | translate }} + - Privacy Policy + + {{ "REGISTER_PAGE.VALIDATIONS.CHECK_BOX_TEXTS.PRIVACY_POLICY" | translate }} +
@@ -200,7 +210,7 @@

Register

[disabled]="submitted || !form.valid || !user.terms" [class.btn-pulse]="submitted" > - Register + {{ "BUTTONS.REGISTER" | translate }}
@@ -211,13 +221,17 @@

Register

- Don’t know your workspace? - Find your workspaces + {{ "WORKSPACES.UNKNOWN_WORKSPACE" | translate }} + + {{ "WORKSPACES.FIND_WORKSPACE" | translate }} +
- Already have an account? - Log in + {{ "REGISTER_PAGE.HAVE_AN_ACCOUNT" | translate }} + + {{ "BUTTONS.LOGIN" | translate }} +
diff --git a/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss b/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss index 6685be66fe4..531387f9928 100644 --- a/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss +++ b/apps/gauzy/src/app/pages/employees/timesheet/weekly/weekly/weekly.component.scss @@ -41,9 +41,14 @@ color: nb-theme(gauzy-text-color-2); background: var(--gauzy-card-4); border-radius: nb-theme(border-radius); - padding: 3px; - height: 42px; + padding: 10px; padding-left: 12px; + flex-wrap: nowrap; + + .project-name { + flex: 0 0 20%; + max-width: 20%; + } } nb-card-body { diff --git a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html index 0779dc76516..8a11ec43544 100644 --- a/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html +++ b/apps/gauzy/src/app/pages/integrations/gauzy-ai/components/authorization/authorization.component.html @@ -13,7 +13,7 @@
-
+
+
+ + +
-