From 56d2adcd707d80ff2bddfc0c4a93d2fabf856e4d Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Mon, 6 Jan 2020 19:53:26 +0100 Subject: [PATCH] refactor: fix code formatting --- src/app/app.component.html | 11 +- src/app/app.component.ts | 22 +- src/app/core-ui/layout/layout.service.ts | 14 +- .../main-header/main-header.component.html | 50 +- .../main-header/main-header.component.scss | 2 +- .../main-header/main-header.component.ts | 2 +- .../core-ui/side-nav/side-nav.component.html | 14 +- .../core/banner/banner/banner.component.ts | 16 +- src/app/core/language/language.service.ts | 10 +- .../core/persistence/persistence.service.ts | 37 +- .../snack-custom/snack-custom.component.scss | 2 +- .../dialog-edit-attachment.component.html | 4 +- .../dialog-edit-attachment.component.scss | 2 +- .../bookmark-bar/bookmark-bar.component.html | 14 +- .../bookmark-bar/bookmark-bar.component.ts | 13 +- .../dialog-edit-bookmark.component.html | 6 +- .../config-section.component.ts | 29 +- src/app/features/google/google-api.service.ts | 4 +- .../google-sync-cfg.component.html | 16 +- src/app/features/google/google.module.ts | 3 +- .../google/store/google-drive-sync.effects.ts | 14 +- .../github-issue-content.component.html | 6 +- .../github-issue/github-issue.service.ts | 5 +- .../store/github-issue.reducer.ts | 2 +- src/app/features/issue/github/github.const.ts | 1 - .../dialog-jira-add-worklog.component.html | 7 +- .../features/issue/jira/jira-api.service.ts | 8 +- .../jira-cfg-stepper.component.html | 4 +- .../jira/jira-cfg/jira-cfg.component.html | 12 +- .../issue/jira/jira-cfg/jira-cfg.component.ts | 99 +- .../jira-issue-content.component.html | 4 +- .../jira/jira-issue/jira-issue-map.util.ts | 2 +- .../jira-issue/store/jira-issue.effects.ts | 47 +- src/app/features/issue/jira/jira.const.ts | 1 - .../evaluation-sheet.component.html | 32 +- .../evaluation-sheet.component.ts | 14 +- .../improvement-banner.component.html | 26 +- .../dialog-add-note-reminder.component.html | 6 +- .../dialog-add-note.component.html | 4 +- .../dialog-add-note.component.scss | 3 +- .../dialog-view-note-reminder.component.html | 16 +- .../features/note/note/note.component.scss | 5 +- .../features/note/notes/notes.component.html | 4 +- .../procrastination.component.html | 15 +- .../dialog-create-project.component.ts | 2 +- ...dialog-edit-task-repeat-cfg.component.scss | 1 + .../add-task-bar/add-task-bar.component.html | 2 +- .../dialog-add-task-reminder.component.html | 4 +- .../dialog-add-task-reminder.component.ts | 1 - ...time-estimate-for-other-day.component.html | 16 +- .../dialog-time-estimate.component.html | 16 +- .../dialog-view-task-reminder.component.html | 36 +- .../dialog-view-task-reminder.component.ts | 10 +- .../select-task/select-task.component.html | 2 +- .../task-additional-info-item.component.html | 8 +- .../task-additional-info-item.component.ts | 9 +- ...ask-additional-info-wrapper.component.html | 4 +- .../task-additional-info.ani.ts | 2 +- .../task-additional-info.component.html | 94 +- .../task-additional-info.component.ts | 19 +- .../task-summary-table.component.html | 10 +- src/app/features/tasks/task.service.ts | 3 +- .../features/tasks/task/task.component.html | 102 +- src/app/features/tasks/task/task.component.ts | 41 +- src/app/features/tasks/tasks.module.ts | 4 +- .../worklog-export.component.html | 18 +- .../features/worklog/worklog.component.html | 16 +- src/app/imex/imex-meta/imex-meta.service.ts | 2 +- .../config-page/config-page.component.html | 8 +- .../daily-summary.component.html | 20 +- .../daily-summary/daily-summary.module.ts | 2 +- .../plan-tasks-tomorrow.component.html | 2 +- .../plan-tasks-tomorrow.component.scss | 2 +- .../metric-page/metric-page.component.ts | 1 + .../project-page/project-page.component.html | 40 +- .../project-settings.module.ts | 1 - .../schedule-page.component.html | 24 +- .../work-view/backlog/backlog.component.html | 4 +- .../work-view/work-view-page.component.html | 4 +- .../work-view/work-view-page.component.ts | 17 +- .../better-drawer-container.component.html | 18 +- .../better-drawer-container.component.spec.ts | 8 +- .../better-drawer-container.component.ts | 62 +- .../ui/better-drawer/better-drawer.module.ts | 10 +- .../chip-list-input.component.html | 12 +- .../chip-list-input.component.ts | 33 +- .../datetime-input.component.html | 4 +- .../datetime-input.component.ts | 8 +- .../input-duration-slider.component.html | 2 +- .../inline-markdown.component.html | 12 +- .../inline-markdown.component.ts | 31 +- src/assets/fonts/MaterialIcons-Regular.svg | 5541 ++++++++++------- src/assets/i18n/it.json | 1866 +++--- src/assets/icons/browserconfig.xml | 12 +- src/assets/icons/drag-handle.svg | 37 +- src/assets/icons/github.svg | 12 +- src/assets/icons/jira.svg | 29 +- src/assets/icons/play.svg | 13 +- src/assets/icons/safari-pinned-tab.svg | 28 +- src/assets/icons/sp.svg | 10 +- src/index.html | 44 +- .../components/_overwrite-material.scss | 2 +- src/styles/page.scss | 1 + src/styles/util.scss | 2 +- 104 files changed, 4966 insertions(+), 3986 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index c539293fa7..12551fba77 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,6 @@ - + -
+
-
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 2611425f15..53468154d7 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, HostListener, ViewChild, ViewContainerRef, OnDestroy} from '@angular/core'; +import {ChangeDetectionStrategy, Component, HostListener, OnDestroy, ViewChild, ViewContainerRef} from '@angular/core'; import {ProjectService} from './features/project/project.service'; import {ChromeExtensionInterfaceService} from './core/chrome-extension-interface/chrome-extension-interface.service'; import {ShortcutService} from './core-ui/shortcut/shortcut.service'; @@ -26,7 +26,7 @@ import {TranslateService} from '@ngx-translate/core'; import {GlobalThemeService} from './core/theme/global-theme.service'; import {UiHelperService} from './features/ui-helper/ui-helper.service'; import {TaskService} from './features/tasks/task.service'; -import { LanguageService } from './core/language/language.service'; +import {LanguageService} from './core/language/language.service'; @Component({ @@ -41,7 +41,7 @@ import { LanguageService } from './core/language/language.service'; ], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class AppComponent implements OnDestroy{ +export class AppComponent implements OnDestroy { isAllDataLoadedInitially$: Observable = combineLatest([ this._projectService.isRelatedDataLoadedForCurrentProject$, this._store.select(selectIsTaskDataLoaded), @@ -53,9 +53,8 @@ export class AppComponent implements OnDestroy{ @ViewChild('notesElRef', {read: ViewContainerRef, static: false}) notesElRef: ViewContainerRef; @ViewChild('sideNavElRef', {read: ViewContainerRef, static: false}) sideNavElRef: ViewContainerRef; - - private _subs : Subscription = new Subscription(); - isRTL : boolean; + isRTL: boolean; + private _subs: Subscription = new Subscription(); constructor( private _configService: GlobalConfigService, @@ -70,13 +69,13 @@ export class AppComponent implements OnDestroy{ private _globalThemeService: GlobalThemeService, private _uiHelperService: UiHelperService, private _store: Store, - private _languageService : LanguageService, + private _languageService: LanguageService, public readonly layoutService: LayoutService, public readonly bookmarkService: BookmarkService, public readonly taskService: TaskService, public projectService: ProjectService, ) { - this._subs = this._languageService.isLangRTL.subscribe( (val) => { + this._subs = this._languageService.isLangRTL.subscribe((val) => { this.isRTL = val; document.dir = this.isRTL ? 'rtl' : 'ltr'; }); @@ -187,6 +186,9 @@ export class AppComponent implements OnDestroy{ this.sideNavElRef.element.nativeElement.scrollIntoView({behavior: 'smooth'}); } + ngOnDestroy() { + this._subs.unsubscribe(); + } private _initElectronErrorHandler() { this._electronService.ipcRenderer.on(IPC.ERROR, (ev, data: { @@ -205,8 +207,4 @@ export class AppComponent implements OnDestroy{ console.error(data); }); } - - ngOnDestroy() { - this._subs.unsubscribe(); - } } diff --git a/src/app/core-ui/layout/layout.service.ts b/src/app/core-ui/layout/layout.service.ts index a8ce6bf3ec..3681dadf59 100644 --- a/src/app/core-ui/layout/layout.service.ts +++ b/src/app/core-ui/layout/layout.service.ts @@ -26,11 +26,6 @@ const BOTH_OVER = 780; }) export class LayoutService { isShowAddTaskBar$: Observable = this._store$.pipe(select(selectIsShowAddTaskBar)); - - private _isShowSideNav$: Observable = this._store$.pipe(select(selectIsShowSideNav)); - private _isShowNotes$: Observable = this._store$.pipe(select(selectIsShowNotes)); - - isNavAlwaysVisible$: Observable = this._breakPointObserver.observe([ `(min-width: ${NAV_ALWAYS_VISIBLE}px)`, ]).pipe(map(result => result.matches)); @@ -40,7 +35,9 @@ export class LayoutService { isNotesOver$: Observable = this._breakPointObserver.observe([ `(min-width: ${BOTH_OVER}px)`, ]).pipe(map(result => !result.matches)); - + isNavOver$: Observable = this.isNotesNextNavOver$.pipe(map(v => !v)); + isScrolled$ = new BehaviorSubject(false); + private _isShowSideNav$: Observable = this._store$.pipe(select(selectIsShowSideNav)); isShowSideNav$: Observable = this._isShowSideNav$.pipe( switchMap((isShow) => { return isShow @@ -49,8 +46,6 @@ export class LayoutService { }), ); - isNavOver$: Observable = this.isNotesNextNavOver$.pipe(map(v => !v)); - // isShowNotes$: Observable = this._isShowNotes$.pipe( // switchMap((isShow) => { @@ -59,8 +54,7 @@ export class LayoutService { // : this.isBothAlwaysVisible$; // }), // ); - - isScrolled$ = new BehaviorSubject(false); + private _isShowNotes$: Observable = this._store$.pipe(select(selectIsShowNotes)); constructor( private _store$: Store, diff --git a/src/app/core-ui/main-header/main-header.component.html b/src/app/core-ui/main-header/main-header.component.html index bd7970bae5..e68b145385 100644 --- a/src/app/core-ui/main-header/main-header.component.html +++ b/src/app/core-ui/main-header/main-header.component.html @@ -1,21 +1,21 @@
- -
{{(projectService.currentProject$|async).title}}
- @@ -53,45 +53,45 @@
@@ -81,9 +81,9 @@ {{T.MH.SETTINGS|translate}} - - diff --git a/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts b/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts index 85dd519cfb..fc4f5a61e0 100644 --- a/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts +++ b/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts @@ -27,13 +27,6 @@ export class BookmarkBarComponent implements OnDestroy { T = T; isContextMenuDisabled = false; bookmarkBarHeight = 50; - - @ViewChild('bookmarkBar', {read: ElementRef, static: false}) set bookmarkBarEl(content: ElementRef) { - if (content && content.nativeElement) { - this.bookmarkBarHeight = content.nativeElement.offsetHeight; - } - } - private _subs = new Subscription(); constructor( @@ -57,6 +50,12 @@ export class BookmarkBarComponent implements OnDestroy { ); } + @ViewChild('bookmarkBar', {read: ElementRef, static: false}) set bookmarkBarEl(content: ElementRef) { + if (content && content.nativeElement) { + this.bookmarkBarHeight = content.nativeElement.offsetHeight; + } + } + ngOnDestroy() { this._subs.unsubscribe(); } diff --git a/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.html b/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.html index 871b693a16..a48c53959a 100644 --- a/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.html +++ b/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.html @@ -9,10 +9,10 @@
@@ -28,8 +28,8 @@ {{bookmarkCopy.icon}} ; - - @Input() set cfg(v: any) { - this._cfg = v; - if (v && this._instance) { - this._instance.cfg = {...v}; - } - } - - get cfg() { - return this._cfg; - } - @Output() save: EventEmitter<{ sectionKey: GlobalConfigSectionKey | ProjectCfgFormKey, config: any }> = new EventEmitter(); - @ViewChild('customForm', {read: ViewContainerRef, static: true}) customFormRef: ViewContainerRef; - isExpanded = false; - private _subs = new Subscription(); - private _cfg: any; private _instance; private _viewDestroyTimeout: number; @@ -62,6 +46,19 @@ export class ConfigSectionComponent implements OnInit, OnDestroy { ) { } + private _cfg: any; + + get cfg() { + return this._cfg; + } + + @Input() set cfg(v: any) { + this._cfg = v; + if (v && this._instance) { + this._instance.cfg = {...v}; + } + } + ngOnInit(): void { if (this.section && this.section.customSection) { this._loadCustomSection(this.section.customSection); diff --git a/src/app/features/google/google-api.service.ts b/src/app/features/google/google-api.service.ts index 3f2bec30b1..1be7ad4c4d 100644 --- a/src/app/features/google/google-api.service.ts +++ b/src/app/features/google/google-api.service.ts @@ -22,8 +22,8 @@ const EXPIRES_SAFETY_MARGIN = 5 * 60 * 1000; providedIn: 'root', }) export class GoogleApiService { + public isLoggedIn: boolean; private _session$: Observable = this._configService.googleSession$; - private _onTokenExpire$: Observable = this._session$.pipe( switchMap((session) => { if (!session.accessToken) { @@ -37,8 +37,6 @@ export class GoogleApiService { : EMPTY; }) ); - - public isLoggedIn: boolean; public isLoggedIn$: Observable = merge( this._session$, this._onTokenExpire$, diff --git a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html index 957fa49b97..d4fe2d59a6 100644 --- a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html +++ b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.html @@ -2,8 +2,8 @@
- {{T.F.GOOGLE.SYNC_CFG.ENABLE|translate}} @@ -54,9 +54,9 @@ class="form-inputs"> file_upload @@ -96,21 +96,21 @@ timer - + href="https://myaccount.google.com/permissions" + mat-button + target="_blank"> remove_circle Revoke permissions diff --git a/src/app/features/google/google.module.ts b/src/app/features/google/google.module.ts index 407176307f..1b9604d047 100644 --- a/src/app/features/google/google.module.ts +++ b/src/app/features/google/google.module.ts @@ -26,8 +26,7 @@ import {GOOGLE_DRIVE_FEATURE_NAME} from './store/google-drive-sync.reducer'; DialogConfirmDriveSyncLoadComponent, DialogConfirmDriveSyncSaveComponent, ], - exports: [ - ], + exports: [], }) export class GoogleModule { } diff --git a/src/app/features/google/store/google-drive-sync.effects.ts b/src/app/features/google/store/google-drive-sync.effects.ts index 3ced213eef..3534ccd78d 100644 --- a/src/app/features/google/store/google-drive-sync.effects.ts +++ b/src/app/features/google/store/google-drive-sync.effects.ts @@ -2,7 +2,19 @@ import {Injectable} from '@angular/core'; import {Actions, Effect, ofType} from '@ngrx/effects'; import {Store} from '@ngrx/store'; import {GlobalConfigActionTypes, UpdateGlobalConfigSection} from '../../config/store/global-config.actions'; -import {catchError, concatMap, distinctUntilChanged, exhaustMap, filter, map, mapTo, switchMap, take, tap, withLatestFrom} from 'rxjs/operators'; +import { + catchError, + concatMap, + distinctUntilChanged, + exhaustMap, + filter, + map, + mapTo, + switchMap, + take, + tap, + withLatestFrom +} from 'rxjs/operators'; import {combineLatest, EMPTY, from, interval, Observable, of, throwError, zip} from 'rxjs'; import {GoogleDriveSyncService} from '../google-drive-sync.service'; import {GoogleApiService} from '../google-api.service'; diff --git a/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.html b/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.html index 45db922754..61c57a921f 100644 --- a/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.html +++ b/src/app/features/issue/github/github-issue/github-issue-content/github-issue-content.component.html @@ -54,9 +54,9 @@
{{comment.user?.login}} {{T.F.GITHUB.ISSUE_CONTENT.AT|translate}} {{comment.created_at|date:'short'}}
-
+
diff --git a/src/app/features/issue/github/github-issue/github-issue.service.ts b/src/app/features/issue/github/github-issue/github-issue.service.ts index 173e26d9d1..a66a0b71c0 100644 --- a/src/app/features/issue/github/github-issue/github-issue.service.ts +++ b/src/app/features/issue/github/github-issue/github-issue.service.ts @@ -21,6 +21,8 @@ export class GithubIssueService { // githubIssues$: Observable = this._store.pipe(select(selectAllGithubIssues)); // githubIssuesEntities$: Observable> = this._store.pipe(select(selectGithubIssueEntities)); + private _fineWithDeletionIssueIds = []; + constructor( private readonly _store: Store, private readonly _persistenceService: PersistenceService, @@ -29,9 +31,8 @@ export class GithubIssueService { ) { } - private _fineWithDeletionIssueIds = []; - // META + // ---- async loadStateForProject(projectId: string) { const lsGithubIssueState = await this._persistenceService.loadIssuesForProject(projectId, GITHUB_TYPE) as GithubIssueState; diff --git a/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts b/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts index 89b72d43fc..96fe133c97 100644 --- a/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts +++ b/src/app/features/issue/github/github-issue/store/github-issue.reducer.ts @@ -89,7 +89,7 @@ export function githubIssueReducer( if (tasksWithGithubIssue && tasksWithGithubIssue.length > 0) { const issueIds = tasksWithGithubIssue.map(task => task.issueId) - // only remove if data is there in the first place + // only remove if data is there in the first place .filter((issueId) => { const ids = state.ids as number[]; const isInState = ids.includes(+issueId); diff --git a/src/app/features/issue/github/github.const.ts b/src/app/features/issue/github/github.const.ts index 21b0fc1699..fabff08c71 100644 --- a/src/app/features/issue/github/github.const.ts +++ b/src/app/features/issue/github/github.const.ts @@ -1,6 +1,5 @@ // TODO use as a checklist import {GithubCfg} from './github'; -import {FormlyFieldConfig} from '@ngx-formly/core'; import {T} from '../../../t.const'; import {ConfigFormSection, LimitedFormlyFieldConfig} from '../../config/global-config.model'; diff --git a/src/app/features/issue/jira/dialog-jira-add-worklog/dialog-jira-add-worklog.component.html b/src/app/features/issue/jira/dialog-jira-add-worklog/dialog-jira-add-worklog.component.html index 3c9ea758e1..865fb6cfcf 100644 --- a/src/app/features/issue/jira/dialog-jira-add-worklog/dialog-jira-add-worklog.component.html +++ b/src/app/features/issue/jira/dialog-jira-add-worklog/dialog-jira-add-worklog.component.html @@ -10,15 +10,16 @@

{{T.F.JIRA.DIALOG_WORKLOG.SUBMIT_WORKLOG_FOR|translate}} {{issue.key}} {{issue.summary}}.

-

{{T.F.JIRA.DIALOG_WORKLOG.CURRENTLY_LOGGED|translate}} {{(issue.timespent * 1000)|msToString}}

+

{{T.F.JIRA.DIALOG_WORKLOG.CURRENTLY_LOGGED|translate}} {{(issue.timespent * 1000)|msToString}} +

@@ -27,9 +28,9 @@ {{T.F.JIRA.DIALOG_WORKLOG.INVALID_DATE|translate}} diff --git a/src/app/features/issue/jira/jira-api.service.ts b/src/app/features/issue/jira/jira-api.service.ts index 6b27148c82..58fa0d015f 100644 --- a/src/app/features/issue/jira/jira-api.service.ts +++ b/src/app/features/issue/jira/jira-api.service.ts @@ -9,7 +9,13 @@ import { JIRA_REQUEST_TIMEOUT_DURATION } from './jira.const'; import {ProjectService} from '../../project/project.service'; -import {mapIssueResponse, mapIssuesResponse, mapResponse, mapToSearchResults, mapTransitionResponse} from './jira-issue/jira-issue-map.util'; +import { + mapIssueResponse, + mapIssuesResponse, + mapResponse, + mapToSearchResults, + mapTransitionResponse +} from './jira-issue/jira-issue-map.util'; import {JiraOriginalStatus, JiraOriginalTransition, JiraOriginalUser} from './jira-api-responses'; import {JiraCfg} from './jira'; import {ElectronService} from 'ngx-electron'; diff --git a/src/app/features/issue/jira/jira-cfg-stepper/jira-cfg-stepper.component.html b/src/app/features/issue/jira/jira-cfg-stepper/jira-cfg-stepper.component.html index 208ac09da9..bc45e210ef 100644 --- a/src/app/features/issue/jira/jira-cfg-stepper/jira-cfg-stepper.component.html +++ b/src/app/features/issue/jira/jira-cfg-stepper/jira-cfg-stepper.component.html @@ -6,8 +6,8 @@ [formGroup]="credentialsFormGroup"> {{T.F.JIRA.STEPPER.CREDENTIALS|translate}} -

+

- {{T.F.JIRA.CFG_CMP.ENABLE|translate}} @@ -36,9 +36,9 @@ + matInput> + matInput> diff --git a/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts b/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts index 965a8935d2..8f07f2e5e8 100644 --- a/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts +++ b/src/app/features/issue/jira/jira-cfg/jira-cfg.component.ts @@ -25,6 +25,52 @@ import {ProjectService} from '../../../project/project.service'; }) export class JiraCfgComponent implements OnInit, OnDestroy { @Input() section: ConfigFormSection; + @Output() save: EventEmitter<{ sectionKey: GlobalConfigSectionKey | ProjectCfgFormKey, config: any }> = new EventEmitter(); + T = T; + HelperClasses = HelperClasses; + issueSuggestionsCtrl: FormControl = new FormControl(); + customFieldSuggestionsCtrl: FormControl = new FormControl(); + customFields: any [] = []; + customFieldsPromise: Promise; + isLoading$ = new BehaviorSubject(false); + fields: FormlyFieldConfig[]; + form = new FormGroup({}); + options: FormlyFormOptions = {}; + filteredIssueSuggestions$: Observable = this.issueSuggestionsCtrl.valueChanges.pipe( + debounceTime(300), + tap(() => this.isLoading$.next(true)), + switchMap((searchTerm) => { + return (searchTerm && searchTerm.length > 1) + ? this._jiraApiService.issuePicker$(searchTerm) + .pipe( + catchError(() => { + return []; + }) + ) + // Note: the outer array signifies the observable stream the other is the value + : [[]]; + }), + tap((suggestions) => { + this.isLoading$.next(false); + }), + ); + filteredCustomFieldSuggestions$: Observable = this.customFieldSuggestionsCtrl.valueChanges.pipe( + map(value => this._filterCustomFieldSuggestions(value)), + ); + private _subs = new Subscription(); + + constructor( + private _jiraApiService: JiraApiService, + private _snackService: SnackService, + private _projectService: ProjectService, + ) { + } + + private _cfg: JiraCfg; + + get cfg() { + return this._cfg; + } // NOTE: this is legit because it might be that there is no issue provider cfg yet @Input() set cfg(cfg: JiraCfg) { @@ -48,59 +94,6 @@ export class JiraCfgComponent implements OnInit, OnDestroy { } } - get cfg() { - return this._cfg; - } - - @Output() save: EventEmitter<{ sectionKey: GlobalConfigSectionKey | ProjectCfgFormKey, config: any }> = new EventEmitter(); - - T = T; - HelperClasses = HelperClasses; - - issueSuggestionsCtrl: FormControl = new FormControl(); - customFieldSuggestionsCtrl: FormControl = new FormControl(); - customFields: any [] = []; - customFieldsPromise: Promise; - - isLoading$ = new BehaviorSubject(false); - - fields: FormlyFieldConfig[]; - form = new FormGroup({}); - options: FormlyFormOptions = {}; - - filteredIssueSuggestions$: Observable = this.issueSuggestionsCtrl.valueChanges.pipe( - debounceTime(300), - tap(() => this.isLoading$.next(true)), - switchMap((searchTerm) => { - return (searchTerm && searchTerm.length > 1) - ? this._jiraApiService.issuePicker$(searchTerm) - .pipe( - catchError(() => { - return []; - }) - ) - // Note: the outer array signifies the observable stream the other is the value - : [[]]; - }), - tap((suggestions) => { - this.isLoading$.next(false); - }), - ); - - filteredCustomFieldSuggestions$: Observable = this.customFieldSuggestionsCtrl.valueChanges.pipe( - map(value => this._filterCustomFieldSuggestions(value)), - ); - - private _subs = new Subscription(); - private _cfg: JiraCfg; - - constructor( - private _jiraApiService: JiraApiService, - private _snackService: SnackService, - private _projectService: ProjectService, - ) { - } - ngOnInit(): void { this.fields = this.section.items; } diff --git a/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.html b/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.html index 195a451edc..f595748131 100644 --- a/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.html +++ b/src/app/features/issue/jira/jira-issue/jira-issue-content/jira-issue-content.component.html @@ -93,8 +93,8 @@ {{comment.created|date:'short'}}
+ [innerHTML]="comment.body|jiraToMarkdown|markdown" + class="markdown"> diff --git a/src/app/features/issue/jira/jira-issue/jira-issue-map.util.ts b/src/app/features/issue/jira/jira-issue/jira-issue-map.util.ts index 87f3705fdd..b1a5e096ae 100644 --- a/src/app/features/issue/jira/jira-issue/jira-issue-map.util.ts +++ b/src/app/features/issue/jira/jira-issue/jira-issue-map.util.ts @@ -1,4 +1,4 @@ -import {JiraAttachment, JiraAuthor, JiraChangelogEntry, JiraComment, JiraIssue, } from './jira-issue.model'; +import {JiraAttachment, JiraAuthor, JiraChangelogEntry, JiraComment, JiraIssue} from './jira-issue.model'; import { JiraIssueOriginal, JiraOriginalAttachment, diff --git a/src/app/features/issue/jira/jira-issue/store/jira-issue.effects.ts b/src/app/features/issue/jira/jira-issue/store/jira-issue.effects.ts index 234658b5e6..f0d654fe18 100644 --- a/src/app/features/issue/jira/jira-issue/store/jira-issue.effects.ts +++ b/src/app/features/issue/jira/jira-issue/store/jira-issue.effects.ts @@ -39,25 +39,6 @@ import {HANDLED_ERROR_PROP_STR} from '../../../../../app.constants'; @Injectable() export class JiraIssueEffects { - @Effect({dispatch: false}) pollIssueChangesAndBacklogUpdates: any = this._actions$ - .pipe( - ofType( - // while load state should be enough this just might fix the error of polling for inactive projects? - ProjectActionTypes.LoadProjectRelatedDataSuccess, - ProjectActionTypes.UpdateProjectIssueProviderCfg, - JiraIssueActionTypes.LoadState, - ), - withLatestFrom( - this._projectService.isJiraEnabled$, - this._projectService.currentJiraCfg$, - ), - switchMap(([a, isEnabled, jiraCfg]) => { - return (isEnabled && jiraCfg.isAutoPollTickets) - ? this._pollChangesForIssues$ - : EMPTY; - }) - ); - @Effect() pollNewIssuesToBacklog$: any = this._actions$ .pipe( ofType( @@ -78,7 +59,6 @@ export class JiraIssueEffects { : EMPTY; }), ); - @Effect({dispatch: false}) syncIssueStateToLs$: any = this._actions$ .pipe( ofType( @@ -99,7 +79,6 @@ export class JiraIssueEffects { ), tap(this._saveToLs.bind(this)) ); - @Effect({dispatch: false}) addOpenIssuesToBacklog$: any = this._actions$ .pipe( ofType( @@ -110,8 +89,6 @@ export class JiraIssueEffects { ), tap(this._importNewIssuesToBacklog.bind(this)) ); - - @Effect({dispatch: false}) addWorklog$: any = this._actions$ .pipe( ofType( @@ -148,7 +125,6 @@ export class JiraIssueEffects { } }) ); - @Effect({dispatch: false}) checkForReassignment: any = this._actions$ .pipe( ofType( @@ -209,7 +185,6 @@ export class JiraIssueEffects { } }) ); - @Effect({dispatch: false}) checkForStartTransition$: Observable = this._actions$ .pipe( ofType( @@ -229,7 +204,6 @@ export class JiraIssueEffects { return this._handleTransitionForIssue('IN_PROGRESS', jiraCfg, issueData); }), ); - @Effect({dispatch: false}) checkForDoneTransition$: Observable = this._actions$ .pipe( @@ -253,7 +227,6 @@ export class JiraIssueEffects { return this._handleTransitionForIssue('DONE', jiraCfg, issueData); }) ); - @Effect({dispatch: false}) loadMissingIssues$: any = this._taskService.tasksWithMissingIssueData$ .pipe( withLatestFrom( @@ -272,7 +245,6 @@ export class JiraIssueEffects { tasks.forEach((task) => this._jiraIssueService.loadMissingIssueData(task.issueId)); }) ); - @Effect() updateTaskTitleIfChanged$: any = this._actions$ .pipe( ofType( @@ -298,7 +270,6 @@ export class JiraIssueEffects { }) ), ); - private _pollChangesForIssues$: Observable = timer(JIRA_INITIAL_POLL_DELAY, JIRA_POLL_INTERVAL).pipe( withLatestFrom( this._store$.pipe(select(selectJiraIssueIds)), @@ -316,6 +287,24 @@ export class JiraIssueEffects { } }), ); + @Effect({dispatch: false}) pollIssueChangesAndBacklogUpdates: any = this._actions$ + .pipe( + ofType( + // while load state should be enough this just might fix the error of polling for inactive projects? + ProjectActionTypes.LoadProjectRelatedDataSuccess, + ProjectActionTypes.UpdateProjectIssueProviderCfg, + JiraIssueActionTypes.LoadState, + ), + withLatestFrom( + this._projectService.isJiraEnabled$, + this._projectService.currentJiraCfg$, + ), + switchMap(([a, isEnabled, jiraCfg]) => { + return (isEnabled && jiraCfg.isAutoPollTickets) + ? this._pollChangesForIssues$ + : EMPTY; + }) + ); constructor(private readonly _actions$: Actions, private readonly _store$: Store, diff --git a/src/app/features/issue/jira/jira.const.ts b/src/app/features/issue/jira/jira.const.ts index e1d89fc5f4..604eb722f8 100644 --- a/src/app/features/issue/jira/jira.const.ts +++ b/src/app/features/issue/jira/jira.const.ts @@ -1,6 +1,5 @@ // TODO use as a checklist import {JiraCfg} from './jira'; -import {FormlyFieldConfig} from '@ngx-formly/core'; import {GITHUB_INITIAL_POLL_DELAY} from '../github/github.const'; import {T} from '../../../t.const'; import {ConfigFormSection, LimitedFormlyFieldConfig} from '../../config/global-config.model'; diff --git a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.html b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.html index 34f64219a8..da402b6307 100644 --- a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.html +++ b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.html @@ -13,14 +13,14 @@
{{T.F.METRIC.EVAL_FORM.MOOD_HINT|translate}} @@ -31,14 +31,14 @@ {{T.F.METRIC.EVAL_FORM.PRODUCTIVITY_HINT|translate}} @@ -51,34 +51,34 @@ + [suggestions]="(improvementService.improvements$|async)"> + [suggestions]="(obstructionService.obstructions$|async)"> + [toggledItems]="improvementService.repeatedImprovementIds$|async" + additionalActionIcon="repeat">
-
diff --git a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts index c39f277568..f728a2e93c 100644 --- a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts +++ b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts @@ -29,24 +29,16 @@ import {MatDialog} from '@angular/material/dialog'; changeDetection: ChangeDetectionStrategy.OnPush }) export class EvaluationSheetComponent implements OnDestroy, OnInit { - @Input() set day(val: string) { - this.day$.next(val); - } - @Output() save = new EventEmitter(); - T = T; metricForDay: MetricCopy; - day$ = new BehaviorSubject(getWorklogStr()); - // isForToday$: Observable = this.day$.pipe(map(day => day === getWorklogStr())); - private _metricForDay$ = this.day$.pipe( switchMap((day) => this._metricService.getMetricForDayOrDefaultWithCheckedImprovements$(day)), ); + // isForToday$: Observable = this.day$.pipe(map(day => day === getWorklogStr())); private _subs = new Subscription(); - constructor( public obstructionService: ObstructionService, public improvementService: ImprovementService, @@ -58,6 +50,10 @@ export class EvaluationSheetComponent implements OnDestroy, OnInit { ) { } + @Input() set day(val: string) { + this.day$.next(val); + } + ngOnInit(): void { this._subs.add(this._metricForDay$.subscribe(metric => { this.metricForDay = metric; diff --git a/src/app/features/metric/improvement-banner/improvement-banner.component.html b/src/app/features/metric/improvement-banner/improvement-banner.component.html index 0807d1ea3d..abd24963b1 100644 --- a/src/app/features/metric/improvement-banner/improvement-banner.component.html +++ b/src/app/features/metric/improvement-banner/improvement-banner.component.html @@ -1,23 +1,23 @@ -
-
-
{{improvement?.title}}
-
diff --git a/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.html b/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.html index 8b0eb7bd38..7c926ec129 100644 --- a/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.html +++ b/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.html @@ -9,9 +9,9 @@ {{T.F.NOTE.D_ADD_REMINDER.E_ENTER_TITLE|translate}} @@ -19,9 +19,9 @@ + name="reminderDate">
diff --git a/src/app/features/note/dialog-add-note/dialog-add-note.component.html b/src/app/features/note/dialog-add-note/dialog-add-note.component.html index f5b7a26665..0995ab9550 100644 --- a/src/app/features/note/dialog-add-note/dialog-add-note.component.html +++ b/src/app/features/note/dialog-add-note/dialog-add-note.component.html @@ -5,15 +5,15 @@ diff --git a/src/app/features/note/dialog-add-note/dialog-add-note.component.scss b/src/app/features/note/dialog-add-note/dialog-add-note.component.scss index d59a91d717..446eb73d82 100644 --- a/src/app/features/note/dialog-add-note/dialog-add-note.component.scss +++ b/src/app/features/note/dialog-add-note/dialog-add-note.component.scss @@ -3,6 +3,7 @@ :host-context([dir=rtl]) { direction: rtl; } + textarea { display: block; width: 100%; @@ -12,7 +13,7 @@ textarea { padding: $s; min-height: $s*5; - @include mq (xs) { + @include mq(xs) { min-height: 220px; width: 500px; } diff --git a/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.html b/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.html index 8af5955c6c..641e3e7124 100644 --- a/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.html +++ b/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.html @@ -20,8 +20,8 @@
- - - diff --git a/src/app/features/note/note/note.component.scss b/src/app/features/note/note/note.component.scss index 2a900bb427..e981a41341 100644 --- a/src/app/features/note/note/note.component.scss +++ b/src/app/features/note/note/note.component.scss @@ -6,6 +6,7 @@ $noteFontSize: 12px; :host { display: block; margin-right: $s; + :host-context([dir=rtl]) { margin-left: $s; margin-right: unset; @@ -25,11 +26,12 @@ $noteFontSize: 12px; box-shadow: $whiteframe-shadow-3dp; //outline: 2px dashed $c-accent; } + &.isFocused { z-index: 5; } - &.isImg { + &.isImg { border: 0; } @@ -48,6 +50,7 @@ $noteFontSize: 12px; right: unset; left: -$s*0.75; } + // fixes drag and drop on mobile touch-action: none; diff --git a/src/app/features/note/notes/notes.component.html b/src/app/features/note/notes/notes.component.html index b84149fe09..40c610e768 100644 --- a/src/app/features/note/notes/notes.component.html +++ b/src/app/features/note/notes/notes.component.html @@ -6,8 +6,8 @@ add {{T.F.NOTE.NOTES_CMP.ADD_BTN|translate}} - diff --git a/src/app/features/procrastination/procrastination.component.html b/src/app/features/procrastination/procrastination.component.html index e0c1f6dd62..e531e7760e 100644 --- a/src/app/features/procrastination/procrastination.component.html +++ b/src/app/features/procrastination/procrastination.component.html @@ -66,16 +66,16 @@ flaws.

- + - + - + @@ -88,7 +88,8 @@ -

+

diff --git a/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts b/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts index 3eca593fa4..6ae965779c 100644 --- a/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts +++ b/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts @@ -14,7 +14,7 @@ import {Subscription} from 'rxjs'; import {loadFromSessionStorage, saveToSessionStorage} from '../../../../core/persistence/local-storage'; import {GithubCfg} from '../../../issue/github/github'; import {DialogGithubInitialSetupComponent} from '../../../issue/github/dialog-github-initial-setup/dialog-github-initial-setup.component'; -import {DEFAULT_ISSUE_PROVIDER_CFGS, GITHUB_TYPE, JIRA_TYPE} from '../../../issue/issue.const'; +import {GITHUB_TYPE} from '../../../issue/issue.const'; import {T} from '../../../../t.const'; import {DEFAULT_JIRA_CFG} from '../../../issue/jira/jira.const'; import {DEFAULT_GITHUB_CFG} from '../../../issue/github/github.const'; diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss index 76c547611b..db987698c9 100644 --- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss +++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.scss @@ -3,6 +3,7 @@ h1, mat-dialog-actions, help-section { direction: rtl; } } + .form-wrapper { min-width: 280px; } diff --git a/src/app/features/tasks/add-task-bar/add-task-bar.component.html b/src/app/features/tasks/add-task-bar/add-task-bar.component.html index 97569287a8..cdbbd5bd4d 100644 --- a/src/app/features/tasks/add-task-bar/add-task-bar.component.html +++ b/src/app/features/tasks/add-task-bar/add-task-bar.component.html @@ -1,6 +1,6 @@