From 3f10c670f57298d631262fd4d270e90da3b5774d Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Thu, 3 May 2018 18:23:48 -0400 Subject: [PATCH] package update and improving lightbox --- backend/model/sql/IndexingManager.ts | 37 +-- frontend/app/frame/frame.component.ts | 4 +- frontend/app/gallery/gallery.component.html | 3 +- frontend/app/gallery/gallery.component.ts | 18 +- .../lightbox/lightbox.gallery.component.css | 3 - .../lightbox/lightbox.gallery.component.html | 3 +- .../lightbox/lightbox.gallery.component.ts | 280 +++++++++--------- .../photo.lightbox.gallery.component.css | 7 +- .../photo/photo.lightbox.gallery.component.ts | 18 +- .../model/network/authentication.service.ts | 8 +- frontend/app/model/notification.service.ts | 2 +- .../_abstract/abstract.settings.component.ts | 8 +- .../indexing/indexing.settings.component.ts | 18 +- .../indexing/indexing.settings.service.ts | 2 +- gulpfile.js | 13 +- package.json | 66 ++--- 16 files changed, 256 insertions(+), 234 deletions(-) diff --git a/backend/model/sql/IndexingManager.ts b/backend/model/sql/IndexingManager.ts index 098573c0..218c3bb0 100644 --- a/backend/model/sql/IndexingManager.ts +++ b/backend/model/sql/IndexingManager.ts @@ -1,13 +1,13 @@ -import {IIndexingManager} from "../interfaces/IIndexingManager"; -import {IndexingProgressDTO} from "../../../common/entities/settings/IndexingProgressDTO"; -import {ObjectManagerRepository} from "../ObjectManagerRepository"; -import {ISQLGalleryManager} from "./IGalleryManager"; -import * as path from "path"; -import {SQLConnection} from "./SQLConnection"; -import {DirectoryEntity} from "./enitites/DirectoryEntity"; -import {Logger} from "../../Logger"; +import {IIndexingManager} from '../interfaces/IIndexingManager'; +import {IndexingProgressDTO} from '../../../common/entities/settings/IndexingProgressDTO'; +import {ObjectManagerRepository} from '../ObjectManagerRepository'; +import {ISQLGalleryManager} from './IGalleryManager'; +import * as path from 'path'; +import {SQLConnection} from './SQLConnection'; +import {DirectoryEntity} from './enitites/DirectoryEntity'; +import {Logger} from '../../Logger'; -const LOG_TAG = "[IndexingManager]"; +const LOG_TAG = '[IndexingManager]'; export class IndexingManager implements IIndexingManager { directoriesToIndex: string[] = []; @@ -30,24 +30,24 @@ export class IndexingManager implements IIndexingManager { } this.indexingProgress.indexed++; for (let i = 0; i < scanned.directories.length; i++) { - this.directoriesToIndex.push(path.join(scanned.directories[i].path, scanned.directories[i].name)) + this.directoriesToIndex.push(path.join(scanned.directories[i].path, scanned.directories[i].name)); } process.nextTick(this.indexNewDirectory); }; startIndexing(): void { if (this.directoriesToIndex.length == 0 && this.enabled == false) { - Logger.info(LOG_TAG, "Starting indexing"); + Logger.info(LOG_TAG, 'Starting indexing'); this.indexingProgress = { indexed: 0, left: 0, - current: "" + current: '' }; - this.directoriesToIndex.push("/"); + this.directoriesToIndex.push('/'); this.enabled = true; this.indexNewDirectory(); } else { - Logger.info(LOG_TAG, "Already indexing.."); + Logger.info(LOG_TAG, 'Already indexing..'); } } @@ -56,7 +56,7 @@ export class IndexingManager implements IIndexingManager { } cancelIndexing(): void { - Logger.info(LOG_TAG, "Canceling indexing"); + Logger.info(LOG_TAG, 'Canceling indexing'); this.directoriesToIndex = []; this.indexingProgress = null; this.enabled = false; @@ -66,15 +66,16 @@ export class IndexingManager implements IIndexingManager { } async reset(): Promise { - Logger.info(LOG_TAG, "Resetting DB"); + Logger.info(LOG_TAG, 'Resetting DB'); this.directoriesToIndex = []; this.indexingProgress = null; this.enabled = false; const connection = await SQLConnection.getConnection(); return connection .getRepository(DirectoryEntity) - .createQueryBuilder("directory") + .createQueryBuilder('directory') .delete() - .execute(); + .execute().then(() => { + }); } } diff --git a/frontend/app/frame/frame.component.ts b/frontend/app/frame/frame.component.ts index d18f7973..acf4f246 100644 --- a/frontend/app/frame/frame.component.ts +++ b/frontend/app/frame/frame.component.ts @@ -16,9 +16,9 @@ import {NotificationService} from '../model/notification.service'; export class FrameComponent { user: BehaviorSubject; - authenticationRequired: boolean = false; + authenticationRequired = false; public title: string; - isIn: boolean = false; + isIn = false; constructor(private _authService: AuthenticationService, public notificationService: NotificationService) { diff --git a/frontend/app/gallery/gallery.component.html b/frontend/app/gallery/gallery.component.html index 3aba757e..404f25cc 100644 --- a/frontend/app/gallery/gallery.component.html +++ b/frontend/app/gallery/gallery.component.html @@ -1,4 +1,4 @@ - + @@ -18,7 +18,6 @@
    • - -     diff --git a/frontend/app/gallery/gallery.component.ts b/frontend/app/gallery/gallery.component.ts index 9dc8a45e..7aa5c1fc 100644 --- a/frontend/app/gallery/gallery.component.ts +++ b/frontend/app/gallery/gallery.component.ts @@ -11,7 +11,7 @@ import {SearchResultDTO} from '../../../common/entities/SearchResultDTO'; import {ShareService} from './share.service'; import {NavigationService} from '../model/navigation.service'; import {UserRoles} from '../../../common/entities/UserDTO'; -import {Observable} from 'rxjs/Rx'; +import {interval} from 'rxjs/observable/interval'; import {ContentWrapper} from '../../../common/entities/ConentWrapper'; @Component({ @@ -24,8 +24,8 @@ export class GalleryComponent implements OnInit, OnDestroy { @ViewChild(GallerySearchComponent) search: GallerySearchComponent; @ViewChild(GalleryGridComponent) grid: GalleryGridComponent; - public showSearchBar: boolean = false; - public showShare: boolean = false; + public showSearchBar = false; + public showShare = false; public directories: DirectoryDTO[] = []; public isPhotoWithLocation = false; private $counter; @@ -64,11 +64,11 @@ export class GalleryComponent implements OnInit, OnDestroy { private onRoute = async (params: Params) => { const searchText = params['searchText']; - if (searchText && searchText != '') { - let typeString = params['type']; + if (searchText && searchText !== '') { + const typeString = params['type']; - if (typeString && typeString != '') { - let type: SearchTypes = SearchTypes[typeString]; + if (typeString && typeString !== '') { + const type: SearchTypes = SearchTypes[typeString]; this._galleryService.search(searchText, type); return; } @@ -77,7 +77,7 @@ export class GalleryComponent implements OnInit, OnDestroy { return; } - if (params['sharingKey'] && params['sharingKey'] != '') { + if (params['sharingKey'] && params['sharingKey'] !== '') { const sharing = await this.shareService.getSharing(); this._router.navigate(['/gallery', sharing.path], {queryParams: {sk: this.shareService.getSharingKey()}}); return; @@ -140,7 +140,7 @@ export class GalleryComponent implements OnInit, OnDestroy { this.subscription.route = this._route.params.subscribe(this.onRoute); if (this.shareService.isSharing()) { - this.$counter = Observable.interval(1000); + this.$counter = interval(1000); this.subscription.timer = this.$counter.subscribe((x) => this.updateTimer(x)); } diff --git a/frontend/app/gallery/lightbox/lightbox.gallery.component.css b/frontend/app/gallery/lightbox/lightbox.gallery.component.css index 84842e5b..00387c33 100644 --- a/frontend/app/gallery/lightbox/lightbox.gallery.component.css +++ b/frontend/app/gallery/lightbox/lightbox.gallery.component.css @@ -6,9 +6,6 @@ width: 100%; /* Full width */ height: 100%; /* Full height */ overflow: hidden; - display: flex; /* add */ - justify-content: center; /* add to align horizontal */ - align-items: center; /* add to align vertical */ cursor: pointer; } diff --git a/frontend/app/gallery/lightbox/lightbox.gallery.component.html b/frontend/app/gallery/lightbox/lightbox.gallery.component.html index bc5d0c9d..4cc6e6d0 100644 --- a/frontend/app/gallery/lightbox/lightbox.gallery.component.html +++ b/frontend/app/gallery/lightbox/lightbox.gallery.component.html @@ -33,7 +33,8 @@ *ngIf="!fullScreenService.isFullScreenEnabled()" (click)="fullScreenService.showFullScreen(root)" title="toggle fullscreen" i18n-title> - +
    ; private timerSub: Subscription; - public playBackState: number = 0; + public playBackState = 0; public controllersDimmed = true; public controllersVisible = true; public infoPanelVisible = false; public infoPanelWidth = 0; public animating = false; + startPhotoDimension: Dimension = {top: 0, left: 0, width: 0, height: 0}; + iPvisibilityTimer = null; + visibilityTimer = null; constructor(public fullScreenService: FullScreenService, @@ -47,7 +63,7 @@ export class GalleryLightboxComponent implements OnDestroy { } ngOnInit(): void { - this.timer = Observable.timer(1000, 2000); + this.timer = timer(1000, 2000); } ngOnDestroy(): void { @@ -77,7 +93,7 @@ export class GalleryLightboxComponent implements OnDestroy { if (this.activePhotoId + 1 < this.gridPhotoQL.length) { this.showPhoto(this.activePhotoId + 1); if (this.activePhotoId + 3 >= this.gridPhotoQL.length) { - this.onLastElement.emit({}); //trigger to render more photos if there are + this.onLastElement.emit({}); // trigger to render more photos if there are } return; } @@ -102,7 +118,7 @@ export class GalleryLightboxComponent implements OnDestroy { this.controllersVisible = true; this.showControls(); this.visible = true; - let selectedPhoto = this.findPhotoComponent(photo); + const selectedPhoto = this.findPhotoComponent(photo); if (selectedPhoto === null) { throw new Error('Can\'t find Photo'); } @@ -125,37 +141,34 @@ export class GalleryLightboxComponent implements OnDestroy { this.blackCanvasOpacity = 0; this.startPhotoDimension = selectedPhoto.getDimension(); - //disable scroll + // disable scroll this.overlayService.showOverlay(); this.blackCanvasOpacity = 1.0; this.showPhoto(this.gridPhotoQL.toArray().indexOf(selectedPhoto), false); } - startPhotoDimension: Dimension = {top: 0, left: 0, width: 0, height: 0}; - - private updateActivePhoto(photoIndex: number, resize: boolean = true) { - let pcList = this.gridPhotoQL.toArray(); - - - if (photoIndex < 0 || photoIndex > this.gridPhotoQL.length) { - throw new Error('Can\'t find the photo'); + //noinspection JSUnusedGlobalSymbols + @HostListener('window:keydown', ['$event']) + onKeyPress(e: KeyboardEvent) { + if (this.visible !== true) { + return; } - this.activePhotoId = photoIndex; - this.activePhoto = pcList[photoIndex]; - - if (resize) { - this.animatePhoto(this.calcLightBoxPhotoDimension(this.activePhoto.gridPhoto.photo)); + const event: KeyboardEvent = window.event ? window.event : e; + switch (event.keyCode) { + case 37: + if (this.activePhotoId > 0) { + this.prevImage(); + } + break; + case 39: + if (this.activePhotoId < this.gridPhotoQL.length - 1) { + this.nextImage(); + } + break; + case 27: // escape + this.hide(); + break; } - this.navigation.hasPrev = photoIndex > 0; - this.navigation.hasNext = photoIndex + 1 < pcList.length; - - let to = this.activePhoto.getDimension(); - - //if target image out of screen -> scroll to there - if (this.getBodyScrollTop() > to.top || this.getBodyScrollTop() + this.getPhotoFrameHeight() < to.top) { - this.setBodyScrollTop(to.top); - } - } public hide() { @@ -228,46 +241,10 @@ export class GalleryLightboxComponent implements OnDestroy { }); } - private findPhotoComponent(photo: any): GalleryPhotoComponent { - let galleryPhotoComponents = this.gridPhotoQL.toArray(); - for (let i = 0; i < galleryPhotoComponents.length; i++) { - if (galleryPhotoComponents[i].gridPhoto.photo == photo) { - return galleryPhotoComponents[i]; - } - } - return null; - } - - //noinspection JSUnusedGlobalSymbols - @HostListener('window:keydown', ['$event']) - onKeyPress(e: KeyboardEvent) { - if (this.visible != true) { - return; - } - let event: KeyboardEvent = window.event ? window.event : e; - switch (event.keyCode) { - case 37: - if (this.activePhotoId > 0) { - this.prevImage(); - } - break; - case 39: - if (this.activePhotoId < this.gridPhotoQL.length - 1) { - this.nextImage(); - } - break; - case 27: //escape - this.hide(); - break; - } - } - - iPvisibilityTimer = null; - public toggleInfoPanel() { - if (this.infoPanelWidth != 400) { + if (this.infoPanelWidth !== 400) { this.showInfoPanel(); } else { this.hideInfoPanel(); @@ -275,6 +252,49 @@ export class GalleryLightboxComponent implements OnDestroy { } + hideInfoPanel(_animate: boolean = true) { + this.iPvisibilityTimer = setTimeout(() => { + this.iPvisibilityTimer = null; + this.infoPanelVisible = false; + }, 1000); + + const starPhotoPos = this.calcLightBoxPhotoDimension(this.activePhoto.gridPhoto.photo); + this.infoPanelWidth = 0; + const endPhotoPos = this.calcLightBoxPhotoDimension(this.activePhoto.gridPhoto.photo); + if (_animate) { + this.animatePhoto(starPhotoPos, endPhotoPos); + } + if (_animate) { + this.animateLightbox({ + top: 0, + left: 0, + width: this.getPhotoFrameWidth() - 400, + height: this.getPhotoFrameHeight() + }, + { + top: 0, + left: 0, + width: this.getPhotoFrameWidth(), + height: this.getPhotoFrameHeight() + }); + } + } + + public play() { + this.pause(); + this.timerSub = this.timer.pipe(filter(t => t % 2 === 0)).subscribe(() => { + if (this.photoElement.imageLoadFinished === false) { + return; + } + if (this.navigation.hasNext) { + this.nextImage(); + } else { + this.showPhoto(0); + } + }); + this.playBackState = 1; + } + showInfoPanel() { this.infoPanelVisible = true; @@ -299,32 +319,19 @@ export class GalleryLightboxComponent implements OnDestroy { } } - hideInfoPanel(animate: boolean = true) { - this.iPvisibilityTimer = setTimeout(() => { - this.iPvisibilityTimer = null; - this.infoPanelVisible = false; - }, 1000); - - const starPhotoPos = this.calcLightBoxPhotoDimension(this.activePhoto.gridPhoto.photo); - this.infoPanelWidth = 0; - const endPhotoPos = this.calcLightBoxPhotoDimension(this.activePhoto.gridPhoto.photo); - if (animate) { - this.animatePhoto(starPhotoPos, endPhotoPos); - } - if (animate) { - this.animateLightbox({ - top: 0, - left: 0, - width: this.getPhotoFrameWidth() - 400, - height: this.getPhotoFrameHeight() - }, - { - top: 0, - left: 0, - width: this.getPhotoFrameWidth(), - height: this.getPhotoFrameHeight() - }); - } + public fastForward() { + this.pause(); + this.timerSub = this.timer.subscribe(() => { + if (this.photoElement.imageLoadFinished === false) { + return; + } + if (this.navigation.hasNext) { + this.nextImage(); + } else { + this.showPhoto(0); + } + }); + this.playBackState = 2; } @@ -344,26 +351,31 @@ export class GalleryLightboxComponent implements OnDestroy { return window.innerHeight; } + private updateActivePhoto(photoIndex: number, resize: boolean = true) { + const pcList = this.gridPhotoQL.toArray(); - private calcLightBoxPhotoDimension(photo: PhotoDTO): Dimension { - let width = 0; - let height = 0; - const photoAspect = photo.metadata.size.width / photo.metadata.size.height; - const windowAspect = this.getPhotoFrameWidth() / this.getPhotoFrameHeight(); - if (photoAspect < windowAspect) { - width = Math.round(photo.metadata.size.width * (this.getPhotoFrameHeight() / photo.metadata.size.height)); - height = this.getPhotoFrameHeight(); - } else { - width = this.getPhotoFrameWidth(); - height = Math.round(photo.metadata.size.height * (this.getPhotoFrameWidth() / photo.metadata.size.width)); + + if (photoIndex < 0 || photoIndex > this.gridPhotoQL.length) { + throw new Error('Can\'t find the photo'); + } + this.activePhotoId = photoIndex; + this.activePhoto = pcList[photoIndex]; + + if (resize) { + this.animatePhoto(this.calcLightBoxPhotoDimension(this.activePhoto.gridPhoto.photo)); + } + this.navigation.hasPrev = photoIndex > 0; + this.navigation.hasNext = photoIndex + 1 < pcList.length; + + const to = this.activePhoto.getDimension(); + + // if target image out of screen -> scroll to there + if (this.getBodyScrollTop() > to.top || this.getBodyScrollTop() + this.getPhotoFrameHeight() < to.top) { + this.setBodyScrollTop(to.top); } - let top = (this.getPhotoFrameHeight() / 2 - height / 2); - let left = (this.getPhotoFrameWidth() / 2 - width / 2); - return {top: top, left: left, width: width, height: height}; } - visibilityTimer = null; @HostListener('mousemove') onMousemove() { @@ -391,34 +403,32 @@ export class GalleryLightboxComponent implements OnDestroy { this.playBackState = 0; } - public play() { - this.pause(); - this.timerSub = this.timer.filter(t => t % 2 == 0).subscribe(() => { - if (this.photoElement.imageLoadFinished == false) { - return; + private findPhotoComponent(photo: any): GalleryPhotoComponent { + const galleryPhotoComponents = this.gridPhotoQL.toArray(); + for (let i = 0; i < galleryPhotoComponents.length; i++) { + if (galleryPhotoComponents[i].gridPhoto.photo === photo) { + return galleryPhotoComponents[i]; } - if (this.navigation.hasNext) { - this.nextImage(); - } else { - this.showPhoto(0); - } - }); - this.playBackState = 1; + } + return null; } - public fastForward() { - this.pause(); - this.timerSub = this.timer.subscribe(() => { - if (this.photoElement.imageLoadFinished == false) { - return; - } - if (this.navigation.hasNext) { - this.nextImage(); - } else { - this.showPhoto(0); - } - }); - this.playBackState = 2; + private calcLightBoxPhotoDimension(photo: PhotoDTO): Dimension { + let width = 0; + let height = 0; + const photoAspect = photo.metadata.size.width / photo.metadata.size.height; + const windowAspect = this.getPhotoFrameWidth() / this.getPhotoFrameHeight(); + if (photoAspect < windowAspect) { + width = Math.round(photo.metadata.size.width * (this.getPhotoFrameHeight() / photo.metadata.size.height)); + height = this.getPhotoFrameHeight(); + } else { + width = this.getPhotoFrameWidth(); + height = Math.round(photo.metadata.size.height * (this.getPhotoFrameWidth() / photo.metadata.size.width)); + } + const top = (this.getPhotoFrameHeight() / 2 - height / 2); + const left = (this.getPhotoFrameWidth() / 2 - width / 2); + + return {top: top, left: left, width: width, height: height}; } } diff --git a/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.css b/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.css index 3ac2717c..db5d1363 100644 --- a/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.css +++ b/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.css @@ -1,9 +1,8 @@ .imgContainer img { position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); } -.imgContainer { - justify-content: center; /* add to align horizontal */ - align-items: center; /* add to align vertical */ -} diff --git a/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.ts b/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.ts index 6fbc09de..c9a5311c 100644 --- a/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.ts +++ b/frontend/app/gallery/lightbox/photo/photo.lightbox.gallery.component.ts @@ -9,13 +9,13 @@ import {GridPhoto} from '../../grid/GridPhoto'; export class GalleryLightboxPhotoComponent implements OnChanges { @Input() gridPhoto: GridPhoto; - @Input() loadImage: boolean = false; - @Input() windowAspect: number = 1; + @Input() loadImage = false; + @Input() windowAspect = 1; public imageSize = {width: 'auto', height: '100'}; - imageLoaded: boolean = false; - public imageLoadFinished: boolean = false; + imageLoaded = false; + public imageLoadFinished = false; constructor(public elementRef: ElementRef) { } @@ -28,7 +28,7 @@ export class GalleryLightboxPhotoComponent implements OnChanges { } onImageError() { - //TODO:handle error + // TODO:handle error this.imageLoadFinished = true; console.error('cant load image'); } @@ -40,16 +40,18 @@ export class GalleryLightboxPhotoComponent implements OnChanges { } public thumbnailPath(): string { - if (this.gridPhoto.isThumbnailAvailable() === true) + if (this.gridPhoto.isThumbnailAvailable() === true) { return this.gridPhoto.getThumbnailPath(); + } - if (this.gridPhoto.isReplacementThumbnailAvailable() === true) + if (this.gridPhoto.isReplacementThumbnailAvailable() === true) { return this.gridPhoto.getReplacementThumbnailPath(); + } return null; } public showThumbnail(): boolean { - return this.gridPhoto && !this.imageLoaded && + return this.gridPhoto /*&& !this.imageLoaded*/ && (this.gridPhoto.isThumbnailAvailable() || this.gridPhoto.isReplacementThumbnailAvailable()); } diff --git a/frontend/app/model/network/authentication.service.ts b/frontend/app/model/network/authentication.service.ts index 0a94882f..1c85fc28 100644 --- a/frontend/app/model/network/authentication.service.ts +++ b/frontend/app/model/network/authentication.service.ts @@ -22,8 +22,8 @@ export class AuthenticationService { private _networkService: NetworkService) { this.user = new BehaviorSubject(null); - //picking up session.. - if (this.isAuthenticated() == false && Cookie.get(CookieNames.session) != null) { + // picking up session.. + if (this.isAuthenticated() === false && Cookie.get(CookieNames.session) != null) { if (typeof ServerInject !== 'undefined' && typeof ServerInject.user !== 'undefined') { this.user.next(ServerInject.user); } @@ -35,11 +35,11 @@ export class AuthenticationService { } _networkService.addGlobalErrorHandler((error: ErrorDTO) => { - if (error.code == ErrorCodes.NOT_AUTHENTICATED) { + if (error.code === ErrorCodes.NOT_AUTHENTICATED) { this.user.next(null); return true; } - if (error.code == ErrorCodes.NOT_AUTHORISED) { + if (error.code === ErrorCodes.NOT_AUTHORISED) { this.logout(); return true; } diff --git a/frontend/app/model/notification.service.ts b/frontend/app/model/notification.service.ts index 93b3f717..6a05e302 100644 --- a/frontend/app/model/notification.service.ts +++ b/frontend/app/model/notification.service.ts @@ -24,7 +24,7 @@ export class NotificationService { this._authService.user.subscribe(() => { if (this._authService.isAuthenticated() && (!this.lastUser || - this.lastUser.id != this._authService.user.value.id) && + this.lastUser.id !== this._authService.user.value.id) && this._authService.user.value.role >= UserRoles.Guest) { this.getServerNotifications(); } diff --git a/frontend/app/settings/_abstract/abstract.settings.component.ts b/frontend/app/settings/_abstract/abstract.settings.component.ts index e02bf7cf..09e109ed 100644 --- a/frontend/app/settings/_abstract/abstract.settings.component.ts +++ b/frontend/app/settings/_abstract/abstract.settings.component.ts @@ -10,21 +10,21 @@ import {IPrivateConfig} from '../../../../common/config/private/IPrivateConfig'; import {I18n} from '@ngx-translate/i18n-polyfill'; -export abstract class SettingsComponent=AbstractSettingsService> +export abstract class SettingsComponent= AbstractSettingsService> implements OnInit, OnDestroy, OnChanges { @Input() - public simplifiedMode: boolean = true; + public simplifiedMode = true; @ViewChild('settingsForm') form: HTMLFormElement; @Output('hasAvailableSettings') - hasAvailableSettings: boolean = true; + hasAvailableSettings = true; public inProgress = false; public error: string = null; - public changed: boolean = false; + public changed = false; private _subscription = null; private _settingsSubscription = null; diff --git a/frontend/app/settings/indexing/indexing.settings.component.ts b/frontend/app/settings/indexing/indexing.settings.component.ts index ded5b0a4..566c4b4d 100644 --- a/frontend/app/settings/indexing/indexing.settings.component.ts +++ b/frontend/app/settings/indexing/indexing.settings.component.ts @@ -1,10 +1,11 @@ -import {Component} from '@angular/core'; +import {Component, OnDestroy, OnInit} from '@angular/core'; import {IndexingSettingsService} from './indexing.settings.service'; import {AuthenticationService} from '../../model/network/authentication.service'; import {NavigationService} from '../../model/navigation.service'; import {NotificationService} from '../../model/notification.service'; import {ErrorDTO} from '../../../../common/entities/Error'; -import {Observable} from 'rxjs/Rx'; +import {Observable} from 'rxjs/Observable'; +import {interval} from 'rxjs/observable/interval'; import {IndexingConfig, ReIndexingSensitivity} from '../../../../common/config/private/IPrivateConfig'; import {SettingsComponent} from '../_abstract/abstract.settings.component'; import {Utils} from '../../../../common/Utils'; @@ -17,7 +18,8 @@ import {I18n} from '@ngx-translate/i18n-polyfill'; './../_abstract/abstract.settings.component.css'], providers: [IndexingSettingsService], }) -export class IndexingSettingsComponent extends SettingsComponent { +export class IndexingSettingsComponent extends SettingsComponent + implements OnInit, OnDestroy { types: Array = []; @@ -37,7 +39,7 @@ export class IndexingSettingsComponent extends SettingsComponentthis._settingsService).progress.value != null && this.subscription.timer == null) { if (!this.$counter) { - this.$counter = Observable.interval(5000); + this.$counter = interval(5000); } this.subscription.timer = this.$counter.subscribe((x) => this.updateProgress()); } @@ -54,7 +56,13 @@ export class IndexingSettingsComponent extends SettingsComponent_settingsService, notification, i18n, s => s.Server.indexing); + super(i18n('Indexing'), + _authService, + _navigation, + _settingsService, + notification, + i18n, + s => s.Server.indexing); } diff --git a/frontend/app/settings/indexing/indexing.settings.service.ts b/frontend/app/settings/indexing/indexing.settings.service.ts index 9985074a..2acba10b 100644 --- a/frontend/app/settings/indexing/indexing.settings.service.ts +++ b/frontend/app/settings/indexing/indexing.settings.service.ts @@ -24,7 +24,7 @@ export class IndexingSettingsService extends AbstractSettingsService= 6.9"