purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2026-03-17 20:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(linting) Migrated over to the ESLint

Browse Source
This commit is contained in:
sercan
2021-05-14 17:17:06 +03:00
parent 0c5f5b9165
commit d159ae1458
182 changed files with 3543 additions and 2400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/modules/admin/apps/academy/academy.module.ts
View File

@@ -23,7 +23,7 @@ import { MatTabsModule } from '@angular/material/tabs';
AcademyDetailsComponent,
AcademyListComponent
],
imports: [
imports : [
RouterModule.forChild(academyRoutes),
MatButtonModule,
MatFormFieldModule,

3
src/app/modules/admin/apps/academy/details/details.component.html
View File

@@ -48,7 +48,8 @@
<div class="py-2 px-8">
<ol>
<ng-container *ngFor="let step of course.steps; let last = last; trackBy: trackByFn">
<li class="relative group py-6"
<li
class="relative group py-6"
[class.current-step]="step.order === currentStep">
<ng-container *ngIf="!last">
<div

12
src/app/modules/admin/apps/academy/list/list.component.ts
View File

@@ -81,23 +81,21 @@ export class AcademyListComponent implements OnInit, OnDestroy
// Filter by category
if ( categorySlug !== 'all' )
{
this.filteredCourses = this.filteredCourses.filter((course) => course.category === categorySlug);
this.filteredCourses = this.filteredCourses.filter(course => course.category === categorySlug);
}
// Filter by search query
if ( query !== '' )
{
this.filteredCourses = this.filteredCourses.filter((course) => {
return course.title.toLowerCase().includes(query.toLowerCase())
|| course.description.toLowerCase().includes(query.toLowerCase())
|| course.category.toLowerCase().includes(query.toLowerCase());
});
this.filteredCourses = this.filteredCourses.filter(course => course.title.toLowerCase().includes(query.toLowerCase())
|| course.description.toLowerCase().includes(query.toLowerCase())
|| course.category.toLowerCase().includes(query.toLowerCase()));
}
// Filter by completed
if ( hideCompleted )
{
this.filteredCourses = this.filteredCourses.filter((course) => course.progress.completed === 0);
this.filteredCourses = this.filteredCourses.filter(course => course.progress.completed === 0);
}
});
}

11
src/app/modules/admin/apps/calendar/calendar.component.ts
View File

@@ -243,10 +243,8 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
day : 'numeric',
omitCommas: true
},
columnHeaderHtml : (date) => {
return `<span class="fc-weekday">${moment(date).format('ddd')}</span>
<span class="fc-date">${moment(date).format('D')}</span>`;
},
columnHeaderHtml : date => `<span class="fc-weekday">${moment(date).format('ddd')}</span>
<span class="fc-date">${moment(date).format('D')}</span>`,
slotDuration : '01:00:00',
slotLabelFormat : this.eventTimeFormat
},
@@ -386,7 +384,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
return;
}
return this.calendars.find((calendar) => calendar.id === id);
return this.calendars.find(calendar => calendar.id === id);
}
/**
@@ -552,7 +550,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
onEventRender(calendarEvent): void
{
// Get event's calendar
const calendar = this.calendars.find((item) => item.id === calendarEvent.event.extendedProps.calendarId);
const calendar = this.calendars.find(item => item.id === calendarEvent.event.extendedProps.calendarId);
// Return if the calendar doesn't exist...
if ( !calendar )
@@ -779,6 +777,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
/**
* Create the event panel overlay
*
* @private
*/
private _createEventPanelOverlay(positionStrategy): void

4
src/app/modules/admin/apps/calendar/calendar.service.ts
View File

@@ -13,7 +13,7 @@ export class CalendarService
// Private
private _calendars: BehaviorSubject<Calendar[] | null> = new BehaviorSubject(null);
private _events: BehaviorSubject<CalendarEvent[] | null> = new BehaviorSubject(null);
private _loadedEventsRange: { start: Moment | null, end: Moment | null } = {
private _loadedEventsRange: { start: Moment | null; end: Moment | null } = {
start: null,
end : null
};
@@ -163,7 +163,7 @@ export class CalendarService
this._calendars.next(calendars);
// Remove the events belong to deleted calendar
const events = this._events.value.filter((event) => event.calendarId !== id);
const events = this._events.value.filter(event => event.calendarId !== id);
// Update the events
this._events.next(events);

2
src/app/modules/admin/apps/calendar/recurrence/recurrence.component.ts
View File

@@ -212,7 +212,7 @@ export class CalendarRecurrenceComponent implements OnInit, OnDestroy
5: 'th'
};
this.nthWeekdayText = nthWeekday.slice(0, 1) + ordinalNumberSuffixes[nthWeekday.slice(0, 1)] + ' ' +
this.weekdays.find((item) => item.value === nthWeekday.slice(-2)).label;
this.weekdays.find(item => item.value === nthWeekday.slice(-2)).label;
// Set the defaults on recurrence form values
this.recurrenceFormValues = {

3
src/app/modules/admin/apps/calendar/sidebar/sidebar.component.ts
View File

@@ -15,8 +15,8 @@ import { calendarColors } from 'app/modules/admin/apps/calendar/sidebar/calendar
})
export class CalendarSidebarComponent implements OnInit, OnDestroy
{
@ViewChild('editPanel') private _editPanel: TemplateRef<any>;
@Output() readonly calendarUpdated: EventEmitter<any> = new EventEmitter<any>();
@ViewChild('editPanel') private _editPanel: TemplateRef<any>;
calendar: Calendar | null;
calendarColors: any = calendarColors;
@@ -194,6 +194,7 @@ export class CalendarSidebarComponent implements OnInit, OnDestroy
/**
* Create the edit panel overlay
*
* @private
*/
private _createEditPanelOverlay(): void

4
src/app/modules/admin/apps/chat/chat.module.ts
View File

@@ -26,7 +26,7 @@ import { ProfileComponent } from 'app/modules/admin/apps/chat/profile/profile.co
NewChatComponent,
ProfileComponent
],
imports: [
imports : [
RouterModule.forChild(chatRoutes),
MatButtonModule,
MatCheckboxModule,
@@ -36,7 +36,7 @@ import { ProfileComponent } from 'app/modules/admin/apps/chat/profile/profile.co
MatMenuModule,
MatSidenavModule,
FuseAutogrowModule,
SharedModule,
SharedModule
]
})
export class ChatModule

8
src/app/modules/admin/apps/chat/chat.types.ts
View File

@@ -20,7 +20,7 @@ export interface Contact
}[];
phoneNumbers?: {
country?: string;
number?: string;
phoneNumber?: string;
label?: string;
}[];
title?: string;
@@ -29,9 +29,9 @@ export interface Contact
address?: string;
};
attachments?: {
media?: any[]
docs?: any[]
links?: any[]
media?: any[];
docs?: any[];
links?: any[];
};
}

2
src/app/modules/admin/apps/chat/chats/chats.component.ts
View File

@@ -98,7 +98,7 @@ export class ChatsComponent implements OnInit, OnDestroy
return;
}
this.filteredChats = this.chats.filter((chat) => chat.contact.name.toLowerCase().includes(query.toLowerCase()));
this.filteredChats = this.chats.filter(chat => chat.contact.name.toLowerCase().includes(query.toLowerCase()));
}
/**

2
src/app/modules/admin/apps/chat/contact-info/contact-info.component.html
View File

@@ -52,7 +52,7 @@
<ng-container *ngIf="chat.contact.details.phoneNumbers.length">
<div>
<div class="font-medium text-secondary">Phone number</div>
<div class="">{{chat.contact.details.phoneNumbers[0].number}}</div>
<div class="">{{chat.contact.details.phoneNumbers[0].phoneNumber}}</div>
</div>
</ng-container>
<ng-container *ngIf="chat.contact.details.title">

66
src/app/modules/admin/apps/chat/conversation/conversation.component.ts
View File

@@ -31,6 +31,39 @@ export class ConversationComponent implements OnInit, OnDestroy
{
}
// -----------------------------------------------------------------------------------------------------
// @ Decorated methods
// -----------------------------------------------------------------------------------------------------
/**
* Resize on 'input' and 'ngModelChange' events
*
* @private
*/
@HostListener('input')
@HostListener('ngModelChange')
private _resizeMessageInput(): void
{
// This doesn't need to trigger Angular's change detection by itself
this._ngZone.runOutsideAngular(() => {
setTimeout(() => {
// Set the height to 'auto' so we can correctly read the scrollHeight
this.messageInput.nativeElement.style.height = 'auto';
// Detect the changes so the height is applied
this._changeDetectorRef.detectChanges();
// Get the scrollHeight and subtract the vertical padding
this.messageInput.nativeElement.style.height = `${this.messageInput.nativeElement.scrollHeight}px`;
// Detect the changes one more time to apply the final height
this._changeDetectorRef.detectChanges();
});
});
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
@@ -132,37 +165,4 @@ export class ConversationComponent implements OnInit, OnDestroy
{
return item.id || index;
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Resize on 'input' and 'ngModelChange' events
*
* @private
*/
@HostListener('input')
@HostListener('ngModelChange')
private _resizeMessageInput(): void
{
// This doesn't need to trigger Angular's change detection by itself
this._ngZone.runOutsideAngular(() => {
setTimeout(() => {
// Set the height to 'auto' so we can correctly read the scrollHeight
this.messageInput.nativeElement.style.height = 'auto';
// Detect the changes so the height is applied
this._changeDetectorRef.detectChanges();
// Get the scrollHeight and subtract the vertical padding
this.messageInput.nativeElement.style.height = `${this.messageInput.nativeElement.scrollHeight}px`;
// Detect the changes one more time to apply the final height
this._changeDetectorRef.detectChanges();
});
});
}
}

6
src/app/modules/admin/apps/chat/new-chat/new-chat.component.ts
View File

@@ -6,9 +6,9 @@ import { Contact } from 'app/modules/admin/apps/chat/chat.types';
import { ChatService } from 'app/modules/admin/apps/chat/chat.service';
@Component({
selector : 'chat-new-chat',
templateUrl : './new-chat.component.html',
encapsulation: ViewEncapsulation.None,
selector : 'chat-new-chat',
templateUrl : './new-chat.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class NewChatComponent implements OnInit, OnDestroy

6
src/app/modules/admin/apps/chat/profile/profile.component.ts
View File

@@ -6,9 +6,9 @@ import { Profile } from 'app/modules/admin/apps/chat/chat.types';
import { ChatService } from 'app/modules/admin/apps/chat/chat.service';
@Component({
selector : 'chat-profile',
templateUrl : './profile.component.html',
encapsulation: ViewEncapsulation.None,
selector : 'chat-profile',
templateUrl : './profile.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ProfileComponent implements OnInit, OnDestroy

4
src/app/modules/admin/apps/contacts/contacts.guards.ts
View File

@@ -41,9 +41,7 @@ export class CanDeactivateContactsDetails implements CanDeactivate<ContactsDetai
else
{
// Close the drawer first, and then navigate
return component.closeDrawer().then(() => {
return true;
});
return component.closeDrawer().then(() => true);
}
}
}

3
src/app/modules/admin/apps/contacts/contacts.service.ts
View File

@@ -127,7 +127,7 @@ export class ContactsService
{
return this.contacts$.pipe(
take(1),
switchMap((contacts) => this._httpClient.post<Contact>('api/apps/contacts/contact', {}).pipe(
switchMap(contacts => this._httpClient.post<Contact>('api/apps/contacts/contact', {}).pipe(
map((newContact) => {
// Update the contacts with the new contact
@@ -354,6 +354,7 @@ export class ContactsService
avatar
}, {
headers: {
// eslint-disable-next-line @typescript-eslint/naming-convention
'Content-Type': avatar.type
}
}).pipe(

8
src/app/modules/admin/apps/contacts/contacts.types.ts
View File

@@ -5,13 +5,13 @@ export interface Contact
background?: string | null;
name: string;
emails?: {
email: string,
label: string
email: string;
label: string;
}[];
phoneNumbers?: {
country: string;
number: string;
label: string
phoneNumber: string;
label: string;
}[];
title?: string;
company?: string;

4
src/app/modules/admin/apps/contacts/details/details.component.html
View File

@@ -126,7 +126,7 @@
[style.backgroundSize]="'24px 3876px'"
[style.backgroundPosition]="getCountryByIso(phoneNumber.country).flagImagePos"></div>
<div class="sm:ml-3 font-mono">{{getCountryByIso(phoneNumber.country).code}}</div>
<div class="ml-2.5 font-mono">{{phoneNumber.number}}</div>
<div class="ml-2.5 font-mono">{{phoneNumber.phoneNumber}}</div>
<div
class="text-md truncate text-secondary"
*ngIf="phoneNumber.label">
@@ -481,7 +481,7 @@
<mat-label *ngIf="first">Phone</mat-label>
<input
matInput
[formControl]="phoneNumber.get('number')"
[formControl]="phoneNumber.get('phoneNumber')"
[placeholder]="'Phone'">
<mat-select
class="mr-1.5"

30
src/app/modules/admin/apps/contacts/details/details.component.ts
View File

@@ -149,9 +149,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
// Create an email form group
phoneNumbersFormGroups.push(
this._formBuilder.group({
country: [phoneNumber.country],
number : [phoneNumber.number],
label : [phoneNumber.label]
country : [phoneNumber.country],
phoneNumber: [phoneNumber.phoneNumber],
label : [phoneNumber.label]
})
);
});
@@ -161,9 +161,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
// Create a phone number form group
phoneNumbersFormGroups.push(
this._formBuilder.group({
country: ['us'],
number : [''],
label : ['']
country : ['us'],
phoneNumber: [''],
label : ['']
})
);
}
@@ -259,13 +259,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
const contact = this.contactForm.getRawValue();
// Go through the contact object and clear empty values
contact.emails = contact.emails.filter((email) => {
return email.email;
});
contact.emails = contact.emails.filter(email => email.email);
contact.phoneNumbers = contact.phoneNumbers.filter((phoneNumber) => {
return phoneNumber.number;
});
contact.phoneNumbers = contact.phoneNumbers.filter(phoneNumber => phoneNumber.phoneNumber);
// Update the contact on the server
this._contactsService.updateContact(contact.id, contact).subscribe(() => {
@@ -480,7 +476,7 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
// If there is a tag...
const tag = this.filteredTags[0];
const isTagApplied = this.contact.tags.find((id) => id === tag.id);
const isTagApplied = this.contact.tags.find(id => id === tag.id);
// If the found tag is already applied to the contact...
if ( isTagApplied )
@@ -652,9 +648,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
{
// Create an empty phone number form group
const phoneNumberFormGroup = this._formBuilder.group({
country: ['us'],
number : [''],
label : ['']
country : ['us'],
phoneNumber: [''],
label : ['']
});
// Add the phone number form group to the phoneNumbers form array
@@ -688,7 +684,7 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
*/
getCountryByIso(iso: string): Country
{
return this.countries.find((country) => country.iso === iso);
return this.countries.find(country => country.iso === iso);
}
/**

14
src/app/modules/admin/apps/contacts/list/list.component.ts
View File

@@ -93,11 +93,11 @@ export class ContactsListComponent implements OnInit, OnDestroy
this.searchInputControl.valueChanges
.pipe(
takeUntil(this._unsubscribeAll),
switchMap((query) => {
switchMap(query =>
// Search
return this._contactsService.searchContacts(query);
})
this._contactsService.searchContacts(query)
)
)
.subscribe();
@@ -136,10 +136,10 @@ export class ContactsListComponent implements OnInit, OnDestroy
fromEvent(this._document, 'keydown')
.pipe(
takeUntil(this._unsubscribeAll),
filter<KeyboardEvent>((event) => {
return (event.ctrlKey === true || event.metaKey) // Ctrl or Cmd
&& (event.key === '/'); // '/'
})
filter<KeyboardEvent>(event =>
(event.ctrlKey === true || event.metaKey) // Ctrl or Cmd
&& (event.key === '/') // '/'
)
)
.subscribe(() => {
this.createContact();

2
src/app/modules/admin/apps/ecommerce/inventory/inventory.resolvers.ts
View File

@@ -131,7 +131,7 @@ export class InventoryProductsResolver implements Resolve<any>
* @param route
* @param state
*/
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ pagination: InventoryPagination, products: InventoryProduct[] }>
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ pagination: InventoryPagination; products: InventoryProduct[] }>
{
return this._inventoryService.getProducts();
}

6
src/app/modules/admin/apps/ecommerce/inventory/inventory.service.ts
View File

@@ -124,9 +124,9 @@ export class InventoryService
* @param search
*/
getProducts(page: number = 0, size: number = 10, sort: string = 'name', order: 'asc' | 'desc' | '' = 'asc', search: string = ''):
Observable<{ pagination: InventoryPagination, products: InventoryProduct[] }>
Observable<{ pagination: InventoryPagination; products: InventoryProduct[] }>
{
return this._httpClient.get<{ pagination: InventoryPagination, products: InventoryProduct[] }>('api/apps/ecommerce/inventory/products', {
return this._httpClient.get<{ pagination: InventoryPagination; products: InventoryProduct[] }>('api/apps/ecommerce/inventory/products', {
params: {
page: '' + page,
size: '' + size,
@@ -179,7 +179,7 @@ export class InventoryService
{
return this.products$.pipe(
take(1),
switchMap((products) => this._httpClient.post<InventoryProduct>('api/apps/ecommerce/inventory/product', {}).pipe(
switchMap(products => this._httpClient.post<InventoryProduct>('api/apps/ecommerce/inventory/product', {}).pipe(
map((newProduct) => {
// Update the products with the new product

6
src/app/modules/admin/apps/ecommerce/inventory/list/inventory.component.ts
View File

@@ -5,7 +5,7 @@ import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { merge, Observable, Subject } from 'rxjs';
import { debounceTime, map, switchMap, takeUntil } from 'rxjs/operators';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { InventoryBrand, InventoryCategory, InventoryPagination, InventoryProduct, InventoryTag, InventoryVendor } from 'app/modules/admin/apps/ecommerce/inventory/inventory.types';
import { InventoryService } from 'app/modules/admin/apps/ecommerce/inventory/inventory.service';
@@ -14,7 +14,7 @@ import { InventoryService } from 'app/modules/admin/apps/ecommerce/inventory/inv
templateUrl : './inventory.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
animations : FuseAnimations
animations : fuseAnimations
})
export class InventoryListComponent implements OnInit, AfterViewInit, OnDestroy
{
@@ -333,7 +333,7 @@ export class InventoryListComponent implements OnInit, AfterViewInit, OnDestroy
// If there is a tag...
const tag = this.filteredTags[0];
const isTagApplied = this.selectedProduct.tags.find((id) => id === tag.id);
const isTagApplied = this.selectedProduct.tags.find(id => id === tag.id);
// If the found tag is already applied to the contact...
if ( isTagApplied )

4
src/app/modules/admin/apps/file-manager/file-manager.guards.ts
View File

@@ -41,9 +41,7 @@ export class CanDeactivateFileManagerDetails implements CanDeactivate<FileManage
else
{
// Close the drawer first, and then navigate
return component.closeDrawer().then(() => {
return true;
});
return component.closeDrawer().then(() => true);
}
}
}

4
src/app/modules/admin/apps/help-center/support/support.component.ts
View File

@@ -1,13 +1,13 @@
import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { HelpCenterService } from 'app/modules/admin/apps/help-center/help-center.service';
@Component({
selector : 'help-center-support',
templateUrl : './support.component.html',
encapsulation: ViewEncapsulation.None,
animations : FuseAnimations
animations : fuseAnimations
})
export class HelpCenterSupportComponent implements OnInit
{

2
src/app/modules/admin/apps/mailbox/compose/compose.component.ts
View File

@@ -10,7 +10,7 @@ import { MatDialogRef } from '@angular/material/dialog';
export class MailboxComposeComponent implements OnInit
{
composeForm: FormGroup;
copyFields: { cc: boolean, bcc: boolean } = {
copyFields: { cc: boolean; bcc: boolean } = {
cc : false,
bcc: false
};

4
src/app/modules/admin/apps/mailbox/details/details.component.ts
View File

@@ -114,9 +114,7 @@ export class MailboxDetailsComponent implements OnInit, OnDestroy
moveToFolder(folderSlug: string): void
{
// Find the folder details
const folder = this.folders.find((item) => {
return item.slug === folderSlug;
});
const folder = this.folders.find(item => item.slug === folderSlug);
// Return if the current folder of the mail
// is already equals to the given folder

12
src/app/modules/admin/apps/mailbox/mailbox.routing.ts
View File

@@ -11,8 +11,8 @@ import { MailboxSettingsComponent } from 'app/modules/admin/apps/mailbox/setting
*
* @param url
*/
export function mailboxRouteMatcher(url: UrlSegment[]): UrlMatchResult
{
export const mailboxRouteMatcher: (url: UrlSegment[]) => UrlMatchResult = (url: UrlSegment[]) => {
// Prepare consumed url and positional parameters
let consumed = url;
const posParams = {};
@@ -52,10 +52,10 @@ export function mailboxRouteMatcher(url: UrlSegment[]): UrlMatchResult
consumed,
posParams
};
}
};
export const mailboxRunGuardsAndResolvers: (from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot) => boolean = (from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot) => {
export function mailboxRunGuardsAndResolvers(from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot): boolean
{
// If we are navigating from mail to mails, meaning there is an id in
// from's deepest first child and there isn't one in the to's, we will
// trigger the resolver
@@ -99,7 +99,7 @@ export function mailboxRunGuardsAndResolvers(from: ActivatedRouteSnapshot, to: A
// Trigger the resolver on other cases
return true;
}
};
export const mailboxRoutes: Route[] = [
{

2
src/app/modules/admin/apps/mailbox/settings/settings.component.ts
View File

@@ -117,7 +117,7 @@ export class MailboxSettingsComponent implements OnInit
const labelsFormArray = this.labelsForm.get('labels') as FormArray;
// Remove the label from the labels form array
labelsFormArray.removeAt(labelsFormArray.value.findIndex((label) => label.id === id));
labelsFormArray.removeAt(labelsFormArray.value.findIndex(label => label.id === id));
// Delete label on the server
this._mailboxService.deleteLabel(id).subscribe();

4
src/app/modules/admin/apps/mailbox/sidebar/sidebar.component.ts
View File

@@ -106,7 +106,7 @@ export class MailboxSidebarComponent implements OnInit, OnDestroy
const dialogRef = this._matDialog.open(MailboxComposeComponent);
dialogRef.afterClosed()
.subscribe(result => {
.subscribe((result) => {
console.log('Compose dialog was closed!');
});
}
@@ -276,7 +276,7 @@ export class MailboxSidebarComponent implements OnInit, OnDestroy
private _updateNavigationBadge(folders: MailFolder[]): void
{
// Get the inbox folder
const inboxFolder = this.folders.find((folder) => folder.slug === 'inbox');
const inboxFolder = this.folders.find(folder => folder.slug === 'inbox');
// Get the component -> navigation mock-api -> item
const mainNavigationComponent = this._fuseNavigationService.getComponent('mainNavigation');

8
src/app/modules/admin/apps/notes/details/details.component.ts
View File

@@ -77,7 +77,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
.pipe(
takeUntil(this._unsubscribeAll),
debounceTime(500),
switchMap((note) => this._notesService.updateNote(note)))
switchMap(note => this._notesService.updateNote(note)))
.subscribe(() => {
// Mark for check
@@ -198,7 +198,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
removeTaskFromNote(note: Note, task: Task): void
{
// Remove the task
note.tasks = note.tasks.filter((item) => item.id !== task.id);
note.tasks = note.tasks.filter(item => item.id !== task.id);
// Update the note
this.noteChanged.next(note);
@@ -228,7 +228,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
*/
isNoteHasLabel(note: Note, label: Label): boolean
{
return !!note.labels.find((item) => item.id === label.id);
return !!note.labels.find(item => item.id === label.id);
}
/**
@@ -242,7 +242,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
// If the note already has the label
if ( this.isNoteHasLabel(note, label) )
{
note.labels = note.labels.filter((item) => item.id !== label.id);
note.labels = note.labels.filter(item => item.id !== label.id);
}
// Otherwise
else

4
src/app/modules/admin/apps/notes/labels/labels.component.ts
View File

@@ -44,8 +44,8 @@ export class NotesLabelsComponent implements OnInit, OnDestroy
.pipe(
takeUntil(this._unsubscribeAll),
debounceTime(500),
filter((label) => label.title.trim() !== ''),
switchMap((label) => this._notesService.updateLabel(label)))
filter(label => label.title.trim() !== ''),
switchMap(label => this._notesService.updateLabel(label)))
.subscribe(() => {
// Mark for check

6
src/app/modules/admin/apps/notes/list/list.component.ts
View File

@@ -85,7 +85,7 @@ export class NotesListComponent implements OnInit, OnDestroy
if ( searchQuery )
{
searchQuery = searchQuery.trim().toLowerCase();
filteredNotes = filteredNotes.filter((note) => note.title.toLowerCase().includes(searchQuery) || note.content.toLowerCase().includes(searchQuery));
filteredNotes = filteredNotes.filter(note => note.title.toLowerCase().includes(searchQuery) || note.content.toLowerCase().includes(searchQuery));
}
// Show all
@@ -96,13 +96,13 @@ export class NotesListComponent implements OnInit, OnDestroy
// Show archive
const isArchive = filter === 'archived';
filteredNotes = filteredNotes.filter((note) => note.archived === isArchive);
filteredNotes = filteredNotes.filter(note => note.archived === isArchive);
// Filter by label
if ( filter.startsWith('label:') )
{
const labelId = filter.split(':')[1];
filteredNotes = filteredNotes.filter((note) => !!note.labels.find((item) => item.id === labelId));
filteredNotes = filteredNotes.filter(note => !!note.labels.find(item => item.id === labelId));
}
return filteredNotes;

4
src/app/modules/admin/apps/notes/notes.service.ts
View File

@@ -186,7 +186,7 @@ export class NotesService
createNote(note: Note): Observable<Note>
{
return this._httpClient.post<Note>('api/apps/notes', {note}).pipe(
switchMap((response) => this.getNotes().pipe(
switchMap(response => this.getNotes().pipe(
switchMap(() => this.getNoteById(response.id).pipe(
map(() => response)
))
@@ -206,7 +206,7 @@ export class NotesService
// Before sending the note to the server, handle the labels
if ( updatedNote.labels.length )
{
updatedNote.labels = updatedNote.labels.map((label) => label.id);
updatedNote.labels = updatedNote.labels.map(label => label.id);
}
return this._httpClient.patch<Note>('api/apps/notes', {updatedNote}).pipe(

2
src/app/modules/admin/apps/tasks/details/details.component.ts
View File

@@ -318,7 +318,7 @@ export class TasksDetailsComponent implements OnInit, AfterViewInit, OnDestroy
// If there is a tag...
const tag = this.filteredTags[0];
const isTagApplied = this.task.tags.find((id) => id === tag.id);
const isTagApplied = this.task.tags.find(id => id === tag.id);
// If the found tag is already applied to the task...
if ( isTagApplied )

8
src/app/modules/admin/apps/tasks/list/list.component.ts
View File

@@ -126,10 +126,10 @@ export class TasksListComponent implements OnInit, OnDestroy
fromEvent(this._document, 'keydown')
.pipe(
takeUntil(this._unsubscribeAll),
filter<KeyboardEvent>((event) => {
return (event.ctrlKey === true || event.metaKey) // Ctrl or Cmd
&& (event.key === '/' || event.key === '.'); // '/' or '.' key
})
filter<KeyboardEvent>(event =>
(event.ctrlKey === true || event.metaKey) // Ctrl or Cmd
&& (event.key === '/' || event.key === '.') // '/' or '.' key
)
)
.subscribe((event: KeyboardEvent) => {

4
src/app/modules/admin/apps/tasks/tasks.guards.ts
View File

@@ -41,9 +41,7 @@ export class CanDeactivateTasksDetails implements CanDeactivate<TasksDetailsComp
else
{
// Close the drawer first, and then navigate
return component.closeDrawer().then(() => {
return true;
});
return component.closeDrawer().then(() => true);
}
}
}

2
src/app/modules/admin/apps/tasks/tasks.service.ts
View File

@@ -239,7 +239,7 @@ export class TasksService
{
return this.tasks$.pipe(
take(1),
switchMap((tasks) => this._httpClient.post<Task>('api/apps/tasks/task', {type}).pipe(
switchMap(tasks => this._httpClient.post<Task>('api/apps/tasks/task', {type}).pipe(
map((newTask) => {
// Update the tasks with the new task