From fbb23829485a9986bddc18a84c35536663f2d3ff Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Wed, 11 Jun 2025 11:10:20 +0200 Subject: [PATCH] refactor(issue): simplify folder and file structure --- .../open-project-attachments.component.ts | 4 +-- src/app/features/issue/issue.model.ts | 25 +++++-------- .../caldav-issue-content.component.html | 0 .../caldav-issue-content.component.scss | 2 +- .../caldav-issue-content.component.ts | 8 ++--- .../providers/caldav/caldav-client.service.ts | 2 +- .../caldav-common-interfaces.service.ts | 2 +- .../caldav/caldav-issue-content.const.ts | 2 +- .../{issue => }/caldav-issue.effects.ts | 18 +++++----- .../caldav/{issue => }/caldav-issue.model.ts | 0 .../gitea-issue-content.component.html | 0 .../gitea-issue-content.component.scss | 0 .../gitea-issue-content.component.ts | 0 .../gitea/format-gitea-issue-title.util.ts | 2 +- .../providers/gitea/gitea-api-responses.d.ts | 2 +- .../providers/gitea/gitea-api.service.ts | 4 +-- .../gitea/gitea-common-interfaces.service.ts | 2 +- .../gitea/gitea-issue-content.const.ts | 2 +- .../gitea/{issue => }/gitea-issue-map.util.ts | 6 ++-- .../gitea/{issue => }/gitea-issue.model.ts | 2 +- .../github-issue-content.component.html | 0 .../github-issue-content.component.scss | 2 +- .../github-issue-content.component.spec.ts | 0 .../github-issue-content.component.ts | 10 +++--- .../providers/github/github-api.service.ts | 8 ++--- .../github-common-interfaces.service.ts | 2 +- .../github/github-issue-content.const.ts | 2 +- .../{issue => }/github-issue-map.util.ts | 4 +-- .../github/{issue => }/github-issue.model.ts | 2 +- .../gitlab-issue-content.component.html | 0 .../gitlab-issue-content.component.scss | 2 +- .../gitlab-issue-content.component.ts | 10 +++--- .../gitlab/gitlab-api/gitlab-api.service.ts | 4 +-- .../gitlab-common-interfaces.service.ts | 2 +- .../gitlab/gitlab-issue-content.const.ts | 2 +- .../{issue => }/gitlab-issue-map.util.ts | 6 ++-- .../{issue => }/gitlab-issue.effects.ts | 12 +++---- .../gitlab/{issue => }/gitlab-issue.model.ts | 2 +- .../jira-issue-content.component.html | 0 .../jira-issue-content.component.scss | 2 +- .../jira-issue-content.component.spec.ts | 0 .../jira-issue-content.component.ts | 24 ++++++------- .../issue/providers/jira/jira-api.service.ts | 4 +-- .../jira/jira-common-interfaces.service.ts | 4 +-- .../jira/jira-issue-content.const.ts | 2 +- .../jira/{issue => }/jira-issue-map.util.ts | 14 ++++---- .../jira/{issue => }/jira-issue.effects.ts | 36 +++++++++---------- .../jira/{issue => }/jira-issue.model.ts | 2 +- .../dialog-jira-add-worklog.component.ts | 2 +- .../dialog-jira-transition.component.ts | 2 +- .../jira-cfg/jira-additional-cfg.component.ts | 2 +- .../open-project-issue-content.component.html | 0 .../open-project-issue-content.component.scss | 2 +- ...en-project-issue-content.component.spec.ts | 0 .../open-project-issue-content.component.ts | 16 ++++----- .../is-open-project-enabled.util.ts | 3 -- .../open-project/open-project-api.service.ts | 4 +-- .../open-project-common-interfaces.service.ts | 2 +- .../open-project-issue-content.const.ts | 2 +- .../open-project-issue-map.util.ts | 12 +++---- .../{issue => }/open-project-issue.model.ts | 2 +- ...ialog-open-project-track-time.component.ts | 2 +- ...ialog-open-project-transition.component.ts | 2 +- .../open-project-additional-cfg.component.ts | 2 +- .../store => }/open-project.effects.spec.ts | 0 .../{issue/store => }/open-project.effects.ts | 24 ++++++------- .../redmine-issue-content.component.html | 0 .../redmine-issue-content.component.scss | 0 .../redmine-issue-content.component.ts | 0 .../format-redmine-issue-subject.utils.ts | 2 +- .../providers/redmine/redmine-api.service.ts | 4 +-- .../redmine-common-interfaces.service.ts | 2 +- .../redmine/redmine-issue-content.const.ts | 2 +- .../{issue => }/redmine-issue-map.util.ts | 6 +--- .../{issue => }/redmine-issue.model.ts | 0 .../add-task-bar/add-task-bar.component.html | 1 - .../add-task-bar/add-task-bar.component.ts | 5 --- src/app/root-store/feature-stores.module.ts | 8 ++--- 78 files changed, 162 insertions(+), 188 deletions(-) rename src/app/features/issue/providers/caldav/{issue/caldav-issue-content => OLD-caldav-issue-content}/caldav-issue-content.component.html (100%) rename src/app/features/issue/providers/caldav/{issue/caldav-issue-content => OLD-caldav-issue-content}/caldav-issue-content.component.scss (95%) rename src/app/features/issue/providers/caldav/{issue/caldav-issue-content => OLD-caldav-issue-content}/caldav-issue-content.component.ts (84%) rename src/app/features/issue/providers/caldav/{issue => }/caldav-issue.effects.ts (78%) rename src/app/features/issue/providers/caldav/{issue => }/caldav-issue.model.ts (100%) rename src/app/features/issue/providers/gitea/{issue/gitea-issue-content => OLD-gitea-issue-content}/gitea-issue-content.component.html (100%) rename src/app/features/issue/providers/gitea/{issue/gitea-issue-content => OLD-gitea-issue-content}/gitea-issue-content.component.scss (100%) rename src/app/features/issue/providers/gitea/{issue/gitea-issue-content => OLD-gitea-issue-content}/gitea-issue-content.component.ts (100%) rename src/app/features/issue/providers/gitea/{issue => }/gitea-issue-map.util.ts (79%) rename src/app/features/issue/providers/gitea/{issue => }/gitea-issue.model.ts (94%) rename src/app/features/issue/providers/github/{issue/github-issue-content => OLD-github-issue-content}/github-issue-content.component.html (100%) rename src/app/features/issue/providers/github/{issue/github-issue-content => OLD-github-issue-content}/github-issue-content.component.scss (96%) rename src/app/features/issue/providers/github/{issue/github-issue-content => OLD-github-issue-content}/github-issue-content.component.spec.ts (100%) rename src/app/features/issue/providers/github/{issue/github-issue-content => OLD-github-issue-content}/github-issue-content.component.ts (87%) rename src/app/features/issue/providers/github/{issue => }/github-issue-map.util.ts (93%) rename src/app/features/issue/providers/github/{issue => }/github-issue.model.ts (97%) rename src/app/features/issue/providers/gitlab/{issue/gitlab-issue-content => OLD-gitlab-issue-content}/gitlab-issue-content.component.html (100%) rename src/app/features/issue/providers/gitlab/{issue/gitlab-issue-content => OLD-gitlab-issue-content}/gitlab-issue-content.component.scss (95%) rename src/app/features/issue/providers/gitlab/{issue/gitlab-issue-content => OLD-gitlab-issue-content}/gitlab-issue-content.component.ts (83%) rename src/app/features/issue/providers/gitlab/{issue => }/gitlab-issue-map.util.ts (92%) rename src/app/features/issue/providers/gitlab/{issue => }/gitlab-issue.effects.ts (82%) rename src/app/features/issue/providers/gitlab/{issue => }/gitlab-issue.model.ts (96%) rename src/app/features/issue/providers/jira/{issue/jira-issue-content => OLD-jira-issue-content}/jira-issue-content.component.html (100%) rename src/app/features/issue/providers/jira/{issue/jira-issue-content => OLD-jira-issue-content}/jira-issue-content.component.scss (96%) rename src/app/features/issue/providers/jira/{issue/jira-issue-content => OLD-jira-issue-content}/jira-issue-content.component.spec.ts (100%) rename src/app/features/issue/providers/jira/{issue/jira-issue-content => OLD-jira-issue-content}/jira-issue-content.component.ts (84%) rename src/app/features/issue/providers/jira/{issue => }/jira-issue-map.util.ts (93%) rename src/app/features/issue/providers/jira/{issue => }/jira-issue.effects.ts (90%) rename src/app/features/issue/providers/jira/{issue => }/jira-issue.model.ts (95%) rename src/app/features/issue/providers/open-project/{issue/open-project-issue-content => OLD-open-project-issue-content}/open-project-issue-content.component.html (100%) rename src/app/features/issue/providers/open-project/{issue/open-project-issue-content => OLD-open-project-issue-content}/open-project-issue-content.component.scss (95%) rename src/app/features/issue/providers/open-project/{issue/open-project-issue-content => OLD-open-project-issue-content}/open-project-issue-content.component.spec.ts (100%) rename src/app/features/issue/providers/open-project/{issue/open-project-issue-content => OLD-open-project-issue-content}/open-project-issue-content.component.ts (86%) rename src/app/features/issue/providers/open-project/{issue => }/open-project-issue-map.util.ts (82%) rename src/app/features/issue/providers/open-project/{issue => }/open-project-issue.model.ts (94%) rename src/app/features/issue/providers/open-project/{issue/store => }/open-project.effects.spec.ts (100%) rename src/app/features/issue/providers/open-project/{issue/store => }/open-project.effects.ts (89%) rename src/app/features/issue/providers/redmine/{issue/redmine-issue-content => OLD-redmine-issue-content}/redmine-issue-content.component.html (100%) rename src/app/features/issue/providers/redmine/{issue/redmine-issue-content => OLD-redmine-issue-content}/redmine-issue-content.component.scss (100%) rename src/app/features/issue/providers/redmine/{issue/redmine-issue-content => OLD-redmine-issue-content}/redmine-issue-content.component.ts (100%) rename src/app/features/issue/providers/redmine/{issue => }/redmine-issue-map.util.ts (77%) rename src/app/features/issue/providers/redmine/{issue => }/redmine-issue.model.ts (100%) diff --git a/src/app/features/issue/issue-content/issue-content-custom/open-project-attachments/open-project-attachments.component.ts b/src/app/features/issue/issue-content/issue-content-custom/open-project-attachments/open-project-attachments.component.ts index 658dad622b..9ae67adbf4 100644 --- a/src/app/features/issue/issue-content/issue-content-custom/open-project-attachments/open-project-attachments.component.ts +++ b/src/app/features/issue/issue-content/issue-content-custom/open-project-attachments/open-project-attachments.component.ts @@ -11,8 +11,6 @@ import { IssueContentConfig } from '../../issue-content.model'; import { IssueProviderService } from '../../../issue-provider.service'; import { OpenProjectApiService } from '../../../providers/open-project/open-project-api.service'; import { TaskAttachment } from '../../../../tasks/task-attachment/task-attachment.model'; -import { mapOpenProjectAttachmentToTaskAttachment } from '../../../providers/open-project/open-project-issue/open-project-issue-map.util'; -import { OpenProjectWorkPackage } from '../../../providers/open-project/open-project-issue/open-project-issue.model'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; @@ -20,6 +18,8 @@ import { TranslateModule } from '@ngx-translate/core'; import { TaskService } from '../../../../tasks/task.service'; import moment from 'moment'; import { SnackService } from '../../../../../core/snack/snack.service'; +import { OpenProjectWorkPackage } from '../../../providers/open-project/open-project-issue.model'; +import { mapOpenProjectAttachmentToTaskAttachment } from '../../../providers/open-project/open-project-issue-map.util'; @Component({ selector: 'open-project-attachments', diff --git a/src/app/features/issue/issue.model.ts b/src/app/features/issue/issue.model.ts index b0fe002d83..2dd8f5be30 100644 --- a/src/app/features/issue/issue.model.ts +++ b/src/app/features/issue/issue.model.ts @@ -1,35 +1,26 @@ -import { - JiraIssue, - JiraIssueReduced, -} from './providers/jira/jira-issue/jira-issue.model'; +import { JiraIssue, JiraIssueReduced } from './providers/jira/jira-issue.model'; import { JiraCfg } from './providers/jira/jira.model'; import { GithubCfg } from './providers/github/github.model'; -import { - GithubIssue, - GithubIssueReduced, -} from './providers/github/github-issue/github-issue.model'; +import { GithubIssue, GithubIssueReduced } from './providers/github/github-issue.model'; import { GitlabCfg } from './providers/gitlab/gitlab.model'; -import { GitlabIssue } from './providers/gitlab/gitlab-issue/gitlab-issue.model'; -import { - CaldavIssue, - CaldavIssueReduced, -} from './providers/caldav/caldav-issue/caldav-issue.model'; +import { GitlabIssue } from './providers/gitlab/gitlab-issue.model'; +import { CaldavIssue, CaldavIssueReduced } from './providers/caldav/caldav-issue.model'; import { CaldavCfg } from './providers/caldav/caldav.model'; import { OpenProjectCfg } from './providers/open-project/open-project.model'; import { OpenProjectWorkPackage, OpenProjectWorkPackageReduced, -} from './providers/open-project/open-project-issue/open-project-issue.model'; +} from './providers/open-project/open-project-issue.model'; import { GiteaCfg } from './providers/gitea/gitea.model'; -import { GiteaIssue } from './providers/gitea/gitea-issue/gitea-issue.model'; +import { GiteaIssue } from './providers/gitea/gitea-issue.model'; import { RedmineCfg } from './providers/redmine/redmine.model'; -import { RedmineIssue } from './providers/redmine/redmine-issue/redmine-issue.model'; +import { RedmineIssue } from './providers/redmine/redmine-issue.model'; import { EntityState } from '@ngrx/entity'; import { MODEL_VERSION_KEY } from '../../app.constants'; import { + CalendarProviderCfg, ICalIssue, ICalIssueReduced, - CalendarProviderCfg, } from './providers/calendar/calendar.model'; export interface BaseIssueProviderCfg { diff --git a/src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.html b/src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.html similarity index 100% rename from src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.html rename to src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.html diff --git a/src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.scss b/src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.scss similarity index 95% rename from src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.scss rename to src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.scss index 068ad65727..fff3fce5e1 100644 --- a/src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.scss +++ b/src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../../variables'; +@import 'variables'; // table styled by ./src/styles/components/issue-table.scss diff --git a/src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.ts b/src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.ts similarity index 84% rename from src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.ts rename to src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.ts index 249de51327..503d3962cb 100644 --- a/src/app/features/issue/providers/caldav/issue/caldav-issue-content/caldav-issue-content.component.ts +++ b/src/app/features/issue/providers/caldav/OLD-caldav-issue-content/caldav-issue-content.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, Input, input, inject } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../../tasks/task.model'; -import { expandAnimation } from '../../../../../../ui/animations/expand.ani'; -import { T } from '../../../../../../t.const'; -import { TaskService } from '../../../../../tasks/task.service'; +import { TaskWithSubTasks } from '../../../../tasks/task.model'; +import { expandAnimation } from '../../../../../ui/animations/expand.ani'; +import { T } from '../../../../../t.const'; +import { TaskService } from '../../../../tasks/task.service'; import { CaldavIssue } from '../caldav-issue.model'; import { MatButton } from '@angular/material/button'; import { MatChipListbox, MatChipOption } from '@angular/material/chips'; diff --git a/src/app/features/issue/providers/caldav/caldav-client.service.ts b/src/app/features/issue/providers/caldav/caldav-client.service.ts index 1f01efb95d..4094e12a7f 100644 --- a/src/app/features/issue/providers/caldav/caldav-client.service.ts +++ b/src/app/features/issue/providers/caldav/caldav-client.service.ts @@ -8,7 +8,7 @@ import Calendar from 'cdav-library/models/calendar'; import ICAL from 'ical.js'; import { from, Observable, throwError } from 'rxjs'; -import { CaldavIssue } from './issue/caldav-issue.model'; +import { CaldavIssue } from './caldav-issue.model'; import { CALDAV_TYPE, ISSUE_PROVIDER_HUMANIZED } from '../../issue.const'; import { SearchResultItem } from '../../issue.model'; import { SnackService } from '../../../../core/snack/snack.service'; diff --git a/src/app/features/issue/providers/caldav/caldav-common-interfaces.service.ts b/src/app/features/issue/providers/caldav/caldav-common-interfaces.service.ts index 4cc000a7f1..a7b34bb3ab 100644 --- a/src/app/features/issue/providers/caldav/caldav-common-interfaces.service.ts +++ b/src/app/features/issue/providers/caldav/caldav-common-interfaces.service.ts @@ -3,7 +3,7 @@ import { Observable, of } from 'rxjs'; import { Task } from 'src/app/features/tasks/task.model'; import { IssueServiceInterface } from '../../issue-service-interface'; import { IssueProviderCaldav, SearchResultItem } from '../../issue.model'; -import { CaldavIssue, CaldavIssueReduced } from './issue/caldav-issue.model'; +import { CaldavIssue, CaldavIssueReduced } from './caldav-issue.model'; import { CaldavClientService } from './caldav-client.service'; import { CaldavCfg } from './caldav.model'; import { concatMap, first, map, switchMap } from 'rxjs/operators'; diff --git a/src/app/features/issue/providers/caldav/caldav-issue-content.const.ts b/src/app/features/issue/providers/caldav/caldav-issue-content.const.ts index c60aab1586..4bc592e996 100644 --- a/src/app/features/issue/providers/caldav/caldav-issue-content.const.ts +++ b/src/app/features/issue/providers/caldav/caldav-issue-content.const.ts @@ -3,7 +3,7 @@ import { IssueContentConfig, IssueFieldType, } from '../../issue-content/issue-content.model'; -import { CaldavIssue } from './issue/caldav-issue.model'; +import { CaldavIssue } from './caldav-issue.model'; import { IssueProviderKey } from '../../issue.model'; export const CALDAV_ISSUE_CONTENT_CONFIG: IssueContentConfig = { diff --git a/src/app/features/issue/providers/caldav/issue/caldav-issue.effects.ts b/src/app/features/issue/providers/caldav/caldav-issue.effects.ts similarity index 78% rename from src/app/features/issue/providers/caldav/issue/caldav-issue.effects.ts rename to src/app/features/issue/providers/caldav/caldav-issue.effects.ts index 79b08f822e..710ef95845 100644 --- a/src/app/features/issue/providers/caldav/issue/caldav-issue.effects.ts +++ b/src/app/features/issue/providers/caldav/caldav-issue.effects.ts @@ -1,17 +1,17 @@ import { Injectable, inject } from '@angular/core'; import { Actions, createEffect, ofType } from '@ngrx/effects'; -import { TaskService } from '../../../../tasks/task.service'; +import { TaskService } from '../../../tasks/task.service'; import { concatMap, filter, map } from 'rxjs/operators'; -import { IssueService } from '../../../issue.service'; +import { IssueService } from '../../issue.service'; import { Observable } from 'rxjs'; import { Task } from 'src/app/features/tasks/task.model'; -import { CALDAV_TYPE } from '../../../issue.const'; -import { isCaldavEnabled } from '../is-caldav-enabled.util'; -import { CaldavClientService } from '../caldav-client.service'; -import { CaldavCfg } from '../caldav.model'; -import { updateTask } from '../../../../tasks/store/task.actions'; -import { IssueProviderService } from '../../../issue-provider.service'; -import { assertTruthy } from '../../../../../util/assert-truthy'; +import { CALDAV_TYPE } from '../../issue.const'; +import { isCaldavEnabled } from './is-caldav-enabled.util'; +import { CaldavClientService } from './caldav-client.service'; +import { CaldavCfg } from './caldav.model'; +import { updateTask } from '../../../tasks/store/task.actions'; +import { IssueProviderService } from '../../issue-provider.service'; +import { assertTruthy } from '../../../../util/assert-truthy'; @Injectable() export class CaldavIssueEffects { diff --git a/src/app/features/issue/providers/caldav/issue/caldav-issue.model.ts b/src/app/features/issue/providers/caldav/caldav-issue.model.ts similarity index 100% rename from src/app/features/issue/providers/caldav/issue/caldav-issue.model.ts rename to src/app/features/issue/providers/caldav/caldav-issue.model.ts diff --git a/src/app/features/issue/providers/gitea/issue/gitea-issue-content/gitea-issue-content.component.html b/src/app/features/issue/providers/gitea/OLD-gitea-issue-content/gitea-issue-content.component.html similarity index 100% rename from src/app/features/issue/providers/gitea/issue/gitea-issue-content/gitea-issue-content.component.html rename to src/app/features/issue/providers/gitea/OLD-gitea-issue-content/gitea-issue-content.component.html diff --git a/src/app/features/issue/providers/gitea/issue/gitea-issue-content/gitea-issue-content.component.scss b/src/app/features/issue/providers/gitea/OLD-gitea-issue-content/gitea-issue-content.component.scss similarity index 100% rename from src/app/features/issue/providers/gitea/issue/gitea-issue-content/gitea-issue-content.component.scss rename to src/app/features/issue/providers/gitea/OLD-gitea-issue-content/gitea-issue-content.component.scss diff --git a/src/app/features/issue/providers/gitea/issue/gitea-issue-content/gitea-issue-content.component.ts b/src/app/features/issue/providers/gitea/OLD-gitea-issue-content/gitea-issue-content.component.ts similarity index 100% rename from src/app/features/issue/providers/gitea/issue/gitea-issue-content/gitea-issue-content.component.ts rename to src/app/features/issue/providers/gitea/OLD-gitea-issue-content/gitea-issue-content.component.ts diff --git a/src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts b/src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts index d55d072a68..e0734168ef 100644 --- a/src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts +++ b/src/app/features/issue/providers/gitea/format-gitea-issue-title.util.ts @@ -1,4 +1,4 @@ -import { GiteaIssue } from './issue/gitea-issue.model'; +import { GiteaIssue } from './gitea-issue.model'; import { truncate } from '../../../../util/truncate'; export const formatGiteaIssueTitle = ({ number, title }: GiteaIssue): string => { diff --git a/src/app/features/issue/providers/gitea/gitea-api-responses.d.ts b/src/app/features/issue/providers/gitea/gitea-api-responses.d.ts index 0df2b768eb..93adb8b381 100644 --- a/src/app/features/issue/providers/gitea/gitea-api-responses.d.ts +++ b/src/app/features/issue/providers/gitea/gitea-api-responses.d.ts @@ -1,4 +1,4 @@ -import { GiteaIssueStateOptions } from './issue/gitea-issue.model'; +import { GiteaIssueStateOptions } from './gitea-issue.model'; export type GiteaIssueState = | GiteaIssueStateOptions.open diff --git a/src/app/features/issue/providers/gitea/gitea-api.service.ts b/src/app/features/issue/providers/gitea/gitea-api.service.ts index 9362ea3b19..ca2a076920 100644 --- a/src/app/features/issue/providers/gitea/gitea-api.service.ts +++ b/src/app/features/issue/providers/gitea/gitea-api.service.ts @@ -11,12 +11,12 @@ import { GiteaIssue, GiteaIssueStateOptions, GiteaRepositoryReduced, -} from './issue/gitea-issue.model'; +} from './gitea-issue.model'; import { isIssueFromProject, mapGiteaIssueIdToIssueNumber, mapGiteaIssueToSearchResult, -} from './issue/gitea-issue-map.util'; +} from './gitea-issue-map.util'; import { GITEA_API_SUBPATH_REPO, GITEA_API_SUBPATH_USER, diff --git a/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts b/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts index db717cd6b7..9f1b4ceca2 100644 --- a/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts +++ b/src/app/features/issue/providers/gitea/gitea-common-interfaces.service.ts @@ -17,7 +17,7 @@ import { import { GiteaCfg } from './gitea.model'; import { isGiteaEnabled } from './is-gitea-enabled.util'; import { GiteaApiService } from '../gitea/gitea-api.service'; -import { GiteaIssue } from './issue/gitea-issue.model'; +import { GiteaIssue } from './gitea-issue.model'; import { IssueProviderService } from '../../issue-provider.service'; @Injectable({ diff --git a/src/app/features/issue/providers/gitea/gitea-issue-content.const.ts b/src/app/features/issue/providers/gitea/gitea-issue-content.const.ts index 3f47c22a5a..f6a37078c5 100644 --- a/src/app/features/issue/providers/gitea/gitea-issue-content.const.ts +++ b/src/app/features/issue/providers/gitea/gitea-issue-content.const.ts @@ -3,7 +3,7 @@ import { IssueContentConfig, IssueFieldType, } from '../../issue-content/issue-content.model'; -import { GiteaIssue } from './issue/gitea-issue.model'; +import { GiteaIssue } from './gitea-issue.model'; export const GITEA_ISSUE_CONTENT_CONFIG: IssueContentConfig = { issueType: 'GITEA' as const, diff --git a/src/app/features/issue/providers/gitea/issue/gitea-issue-map.util.ts b/src/app/features/issue/providers/gitea/gitea-issue-map.util.ts similarity index 79% rename from src/app/features/issue/providers/gitea/issue/gitea-issue-map.util.ts rename to src/app/features/issue/providers/gitea/gitea-issue-map.util.ts index d86c1f098f..0e5650e415 100644 --- a/src/app/features/issue/providers/gitea/issue/gitea-issue-map.util.ts +++ b/src/app/features/issue/providers/gitea/gitea-issue-map.util.ts @@ -1,7 +1,7 @@ -import { IssueProviderKey, SearchResultItem } from '../../../issue.model'; -import { GiteaCfg } from '../gitea.model'; +import { IssueProviderKey, SearchResultItem } from '../../issue.model'; +import { GiteaCfg } from './gitea.model'; import { GiteaIssue } from './gitea-issue.model'; -import { formatGiteaIssueTitle } from '../format-gitea-issue-title.util'; +import { formatGiteaIssueTitle } from './format-gitea-issue-title.util'; export const mapGiteaIssueToSearchResult = (issue: GiteaIssue): SearchResultItem => { return { diff --git a/src/app/features/issue/providers/gitea/issue/gitea-issue.model.ts b/src/app/features/issue/providers/gitea/gitea-issue.model.ts similarity index 94% rename from src/app/features/issue/providers/gitea/issue/gitea-issue.model.ts rename to src/app/features/issue/providers/gitea/gitea-issue.model.ts index eb150d8e17..7f093033c2 100644 --- a/src/app/features/issue/providers/gitea/issue/gitea-issue.model.ts +++ b/src/app/features/issue/providers/gitea/gitea-issue.model.ts @@ -1,4 +1,4 @@ -import { GiteaUser } from '../gitea-api-responses'; +import { GiteaUser } from './gitea-api-responses'; export enum GiteaIssueStateOptions { open = 'open', diff --git a/src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.html b/src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.html similarity index 100% rename from src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.html rename to src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.html diff --git a/src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.scss b/src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.scss similarity index 96% rename from src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.scss rename to src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.scss index ed45dd3622..23da872f2b 100644 --- a/src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.scss +++ b/src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../../variables'; +@import 'variables'; // table styled by ./src/styles/components/issue-table.scss diff --git a/src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.spec.ts b/src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.spec.ts similarity index 100% rename from src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.spec.ts rename to src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.spec.ts diff --git a/src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.ts b/src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.ts similarity index 87% rename from src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.ts rename to src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.ts index b2339eef99..b94814c824 100644 --- a/src/app/features/issue/providers/github/issue/github-issue-content/github-issue-content.component.ts +++ b/src/app/features/issue/providers/github/OLD-github-issue-content/github-issue-content.component.ts @@ -1,15 +1,15 @@ import { ChangeDetectionStrategy, Component, Input, input, inject } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../../tasks/task.model'; +import { TaskWithSubTasks } from '../../../../tasks/task.model'; import { GithubComment, GithubIssue } from '../github-issue.model'; -import { expandAnimation } from '../../../../../../ui/animations/expand.ani'; -import { T } from '../../../../../../t.const'; -import { TaskService } from '../../../../../tasks/task.service'; +import { expandAnimation } from '../../../../../ui/animations/expand.ani'; +import { T } from '../../../../../t.const'; +import { TaskService } from '../../../../tasks/task.service'; import { MatButton, MatAnchor } from '@angular/material/button'; import { MatChipListbox, MatChipOption } from '@angular/material/chips'; import { MarkdownComponent, MarkdownPipe } from 'ngx-markdown'; import { MatIcon } from '@angular/material/icon'; import { AsyncPipe, DatePipe } from '@angular/common'; -import { SortPipe } from '../../../../../../ui/pipes/sort.pipe'; +import { SortPipe } from '../../../../../ui/pipes/sort.pipe'; import { TranslatePipe } from '@ngx-translate/core'; @Component({ diff --git a/src/app/features/issue/providers/github/github-api.service.ts b/src/app/features/issue/providers/github/github-api.service.ts index cbe42a4d1e..c96e27e5cf 100644 --- a/src/app/features/issue/providers/github/github-api.service.ts +++ b/src/app/features/issue/providers/github/github-api.service.ts @@ -16,12 +16,8 @@ import { mapGithubGraphQLSearchResult, mapGithubIssue, mapGithubIssueToSearchResult, -} from './issue/github-issue-map.util'; -import { - GithubComment, - GithubIssue, - GithubIssueReduced, -} from './issue/github-issue.model'; +} from './github-issue-map.util'; +import { GithubComment, GithubIssue, GithubIssueReduced } from './github-issue.model'; import { SearchResultItem } from '../../issue.model'; import { HANDLED_ERROR_PROP_STR } from '../../../../app.constants'; import { T } from '../../../../t.const'; diff --git a/src/app/features/issue/providers/github/github-common-interfaces.service.ts b/src/app/features/issue/providers/github/github-common-interfaces.service.ts index c87b5d3428..3c4e6daa89 100644 --- a/src/app/features/issue/providers/github/github-common-interfaces.service.ts +++ b/src/app/features/issue/providers/github/github-common-interfaces.service.ts @@ -6,7 +6,7 @@ import { IssueServiceInterface } from '../../issue-service-interface'; import { GithubApiService } from './github-api.service'; import { IssueProviderGithub, SearchResultItem } from '../../issue.model'; import { GithubCfg } from './github.model'; -import { GithubIssue, GithubIssueReduced } from './issue/github-issue.model'; +import { GithubIssue, GithubIssueReduced } from './github-issue.model'; import { truncate } from '../../../../util/truncate'; import { getTimestamp } from '../../../../util/get-timestamp'; import { isGithubEnabled } from './is-github-enabled.util'; diff --git a/src/app/features/issue/providers/github/github-issue-content.const.ts b/src/app/features/issue/providers/github/github-issue-content.const.ts index de96d0bf98..d772b71f1f 100644 --- a/src/app/features/issue/providers/github/github-issue-content.const.ts +++ b/src/app/features/issue/providers/github/github-issue-content.const.ts @@ -3,7 +3,7 @@ import { IssueContentConfig, IssueFieldType, } from '../../issue-content/issue-content.model'; -import { GithubIssue } from './issue/github-issue.model'; +import { GithubIssue } from './github-issue.model'; export const GITHUB_ISSUE_CONTENT_CONFIG: IssueContentConfig = { issueType: 'GITHUB' as const, diff --git a/src/app/features/issue/providers/github/issue/github-issue-map.util.ts b/src/app/features/issue/providers/github/github-issue-map.util.ts similarity index 93% rename from src/app/features/issue/providers/github/issue/github-issue-map.util.ts rename to src/app/features/issue/providers/github/github-issue-map.util.ts index a2f6dfc233..c85be5c369 100644 --- a/src/app/features/issue/providers/github/issue/github-issue-map.util.ts +++ b/src/app/features/issue/providers/github/github-issue-map.util.ts @@ -1,6 +1,6 @@ import { GithubIssue, GithubIssueReduced } from './github-issue.model'; -import { GithubOriginalIssue } from '../github-api-responses'; -import { SearchResultItem } from '../../../issue.model'; +import { GithubOriginalIssue } from './github-api-responses'; +import { SearchResultItem } from '../../issue.model'; export const mapGithubIssue = (issue: GithubOriginalIssue): GithubIssue => { return { diff --git a/src/app/features/issue/providers/github/issue/github-issue.model.ts b/src/app/features/issue/providers/github/github-issue.model.ts similarity index 97% rename from src/app/features/issue/providers/github/issue/github-issue.model.ts rename to src/app/features/issue/providers/github/github-issue.model.ts index 4c19ba27ec..5435dfdc54 100644 --- a/src/app/features/issue/providers/github/issue/github-issue.model.ts +++ b/src/app/features/issue/providers/github/github-issue.model.ts @@ -5,7 +5,7 @@ import { GithubOriginalPullRequest, GithubOriginalState, GithubOriginalUser, -} from '../github-api-responses'; +} from './github-api-responses'; export type GithubState = GithubOriginalState; export type GithubUser = GithubOriginalUser; diff --git a/src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.html b/src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.html similarity index 100% rename from src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.html rename to src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.html diff --git a/src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.scss b/src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.scss similarity index 95% rename from src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.scss rename to src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.scss index 068ad65727..fff3fce5e1 100644 --- a/src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.scss +++ b/src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../../variables'; +@import 'variables'; // table styled by ./src/styles/components/issue-table.scss diff --git a/src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.ts b/src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.ts similarity index 83% rename from src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.ts rename to src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.ts index 06473b8a38..c8edbbac83 100644 --- a/src/app/features/issue/providers/gitlab/issue/gitlab-issue-content/gitlab-issue-content.component.ts +++ b/src/app/features/issue/providers/gitlab/OLD-gitlab-issue-content/gitlab-issue-content.component.ts @@ -1,15 +1,15 @@ import { ChangeDetectionStrategy, Component, Input, input, inject } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../../tasks/task.model'; +import { TaskWithSubTasks } from '../../../../tasks/task.model'; import { GitlabIssue } from '../gitlab-issue.model'; -import { expandAnimation } from '../../../../../../ui/animations/expand.ani'; -import { T } from '../../../../../../t.const'; -import { TaskService } from '../../../../../tasks/task.service'; +import { expandAnimation } from '../../../../../ui/animations/expand.ani'; +import { T } from '../../../../../t.const'; +import { TaskService } from '../../../../tasks/task.service'; import { MatButton, MatAnchor } from '@angular/material/button'; import { MatChipListbox, MatChipOption } from '@angular/material/chips'; import { MarkdownComponent, MarkdownPipe } from 'ngx-markdown'; import { MatIcon } from '@angular/material/icon'; import { AsyncPipe, DatePipe } from '@angular/common'; -import { SortPipe } from '../../../../../../ui/pipes/sort.pipe'; +import { SortPipe } from '../../../../../ui/pipes/sort.pipe'; import { TranslatePipe } from '@ngx-translate/core'; @Component({ diff --git a/src/app/features/issue/providers/gitlab/gitlab-api/gitlab-api.service.ts b/src/app/features/issue/providers/gitlab/gitlab-api/gitlab-api.service.ts index 42b6466dd9..ff52696aa6 100644 --- a/src/app/features/issue/providers/gitlab/gitlab-api/gitlab-api.service.ts +++ b/src/app/features/issue/providers/gitlab/gitlab-api/gitlab-api.service.ts @@ -24,12 +24,12 @@ import { reduce, take, } from 'rxjs/operators'; -import { GitlabIssue } from '../issue/gitlab-issue.model'; +import { GitlabIssue } from '../gitlab-issue.model'; import { getPartsFromGitlabIssueId, mapGitlabIssue, mapGitlabIssueToSearchResult, -} from '../issue/gitlab-issue-map.util'; +} from '../gitlab-issue-map.util'; import { SearchResultItem } from '../../../issue.model'; import { GITLAB_TYPE, ISSUE_PROVIDER_HUMANIZED } from '../../../issue.const'; import { assertTruthy } from '../../../../../util/assert-truthy'; diff --git a/src/app/features/issue/providers/gitlab/gitlab-common-interfaces.service.ts b/src/app/features/issue/providers/gitlab/gitlab-common-interfaces.service.ts index 7a4566b56e..2e20d012d5 100644 --- a/src/app/features/issue/providers/gitlab/gitlab-common-interfaces.service.ts +++ b/src/app/features/issue/providers/gitlab/gitlab-common-interfaces.service.ts @@ -6,7 +6,7 @@ import { IssueServiceInterface } from '../../issue-service-interface'; import { GitlabApiService } from './gitlab-api/gitlab-api.service'; import { IssueData, IssueProviderGitlab, SearchResultItem } from '../../issue.model'; import { GitlabCfg } from './gitlab.model'; -import { GitlabIssue } from './issue/gitlab-issue.model'; +import { GitlabIssue } from './gitlab-issue.model'; import { truncate } from '../../../../util/truncate'; import { GITLAB_BASE_URL, GITLAB_POLL_INTERVAL } from './gitlab.const'; import { isGitlabEnabled } from './is-gitlab-enabled.util'; diff --git a/src/app/features/issue/providers/gitlab/gitlab-issue-content.const.ts b/src/app/features/issue/providers/gitlab/gitlab-issue-content.const.ts index 04740044de..fdb589e0c2 100644 --- a/src/app/features/issue/providers/gitlab/gitlab-issue-content.const.ts +++ b/src/app/features/issue/providers/gitlab/gitlab-issue-content.const.ts @@ -4,7 +4,7 @@ import { IssueFieldType, } from '../../issue-content/issue-content.model'; import { IssueProviderKey } from '../../issue.model'; -import { GitlabIssue } from './issue/gitlab-issue.model'; +import { GitlabIssue } from './gitlab-issue.model'; export const GITLAB_ISSUE_CONTENT_CONFIG: IssueContentConfig = { issueType: 'GITLAB' as IssueProviderKey, diff --git a/src/app/features/issue/providers/gitlab/issue/gitlab-issue-map.util.ts b/src/app/features/issue/providers/gitlab/gitlab-issue-map.util.ts similarity index 92% rename from src/app/features/issue/providers/gitlab/issue/gitlab-issue-map.util.ts rename to src/app/features/issue/providers/gitlab/gitlab-issue-map.util.ts index 737c97b3a8..c99154d7cc 100644 --- a/src/app/features/issue/providers/gitlab/issue/gitlab-issue-map.util.ts +++ b/src/app/features/issue/providers/gitlab/gitlab-issue-map.util.ts @@ -1,7 +1,7 @@ import { GitlabIssue } from './gitlab-issue.model'; -import { GitlabOriginalIssue } from '../gitlab-api/gitlab-api-responses'; -import { IssueProviderKey, SearchResultItem } from '../../../issue.model'; -import { GitlabCfg } from '../gitlab.model'; +import { GitlabOriginalIssue } from './gitlab-api/gitlab-api-responses'; +import { IssueProviderKey, SearchResultItem } from '../../issue.model'; +import { GitlabCfg } from './gitlab.model'; export const mapGitlabIssue = ( issue: GitlabOriginalIssue, diff --git a/src/app/features/issue/providers/gitlab/issue/gitlab-issue.effects.ts b/src/app/features/issue/providers/gitlab/gitlab-issue.effects.ts similarity index 82% rename from src/app/features/issue/providers/gitlab/issue/gitlab-issue.effects.ts rename to src/app/features/issue/providers/gitlab/gitlab-issue.effects.ts index b3ad03ce77..23016a1220 100644 --- a/src/app/features/issue/providers/gitlab/issue/gitlab-issue.effects.ts +++ b/src/app/features/issue/providers/gitlab/gitlab-issue.effects.ts @@ -1,12 +1,12 @@ import { inject, Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { first } from 'rxjs/operators'; -import { GITLAB_TYPE } from '../../../issue.const'; -import { IssueProviderService } from '../../../issue-provider.service'; -import { TaskCopy } from '../../../../tasks/task.model'; -import { DialogGitlabSubmitWorklogForDayComponent } from '../dialog-gitlab-submit-worklog-for-day/dialog-gitlab-submit-worklog-for-day.component'; -import { BeforeFinishDayService } from '../../../../before-finish-day/before-finish-day.service'; -import { WorkContextService } from '../../../../work-context/work-context.service'; +import { GITLAB_TYPE } from '../../issue.const'; +import { IssueProviderService } from '../../issue-provider.service'; +import { TaskCopy } from '../../../tasks/task.model'; +import { DialogGitlabSubmitWorklogForDayComponent } from './dialog-gitlab-submit-worklog-for-day/dialog-gitlab-submit-worklog-for-day.component'; +import { BeforeFinishDayService } from '../../../before-finish-day/before-finish-day.service'; +import { WorkContextService } from '../../../work-context/work-context.service'; @Injectable() export class GitlabIssueEffects { diff --git a/src/app/features/issue/providers/gitlab/issue/gitlab-issue.model.ts b/src/app/features/issue/providers/gitlab/gitlab-issue.model.ts similarity index 96% rename from src/app/features/issue/providers/gitlab/issue/gitlab-issue.model.ts rename to src/app/features/issue/providers/gitlab/gitlab-issue.model.ts index a8ae9a4c8f..bf53f10375 100644 --- a/src/app/features/issue/providers/gitlab/issue/gitlab-issue.model.ts +++ b/src/app/features/issue/providers/gitlab/gitlab-issue.model.ts @@ -3,7 +3,7 @@ import { GitlabOriginalIssueState, GitlabOriginalMilestone, GitlabOriginalUser, -} from '../gitlab-api/gitlab-api-responses'; +} from './gitlab-api/gitlab-api-responses'; export type GitlabState = GitlabOriginalIssueState; export type GitlabUser = GitlabOriginalUser; diff --git a/src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.html b/src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.html similarity index 100% rename from src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.html rename to src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.html diff --git a/src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.scss b/src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.scss similarity index 96% rename from src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.scss rename to src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.scss index e2f64db92a..2fbf04cb40 100644 --- a/src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.scss +++ b/src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../../variables'; +@import 'variables'; // table styled by ./src/styles/components/issue-table.scss diff --git a/src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.spec.ts b/src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.spec.ts similarity index 100% rename from src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.spec.ts rename to src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.spec.ts diff --git a/src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.ts b/src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.ts similarity index 84% rename from src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.ts rename to src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.ts index 7e6ded4cfb..9af6c74963 100644 --- a/src/app/features/issue/providers/jira/issue/jira-issue-content/jira-issue-content.component.ts +++ b/src/app/features/issue/providers/jira/OLD-jira-issue-content/jira-issue-content.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component, Input, inject } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../../tasks/task.model'; +import { TaskWithSubTasks } from '../../../../tasks/task.model'; import { JiraIssue, JiraRelatedIssue, JiraSubtask } from '../jira-issue.model'; -import { expandAnimation } from '../../../../../../ui/animations/expand.ani'; -import { TaskAttachment } from '../../../../../tasks/task-attachment/task-attachment.model'; -import { T } from '../../../../../../t.const'; -import { TaskService } from '../../../../../tasks/task.service'; +import { expandAnimation } from '../../../../../ui/animations/expand.ani'; +import { TaskAttachment } from '../../../../tasks/task-attachment/task-attachment.model'; +import { T } from '../../../../../t.const'; +import { TaskService } from '../../../../tasks/task.service'; // @ts-ignore import j2m from 'jira2md'; import { @@ -17,19 +17,19 @@ import { Subject, } from 'rxjs'; import { catchError, map, switchMap } from 'rxjs/operators'; -import { JiraCommonInterfacesService } from '../../jira-common-interfaces.service'; -import { devError } from '../../../../../../util/dev-error'; -import { assertTruthy } from '../../../../../../util/assert-truthy'; +import { JiraCommonInterfacesService } from '../jira-common-interfaces.service'; +import { devError } from '../../../../../util/dev-error'; +import { assertTruthy } from '../../../../../util/assert-truthy'; import { MatButton, MatAnchor } from '@angular/material/button'; import { MatChipListbox, MatChipOption } from '@angular/material/chips'; import { MarkdownComponent, MarkdownPipe } from 'ngx-markdown'; import { MatIcon } from '@angular/material/icon'; import { AsyncPipe, DatePipe } from '@angular/common'; -import { JiraToMarkdownPipe } from '../../../../../../ui/pipes/jira-to-markdown.pipe'; -import { MsToStringPipe } from '../../../../../../ui/duration/ms-to-string.pipe'; -import { SortPipe } from '../../../../../../ui/pipes/sort.pipe'; +import { JiraToMarkdownPipe } from '../../../../../ui/pipes/jira-to-markdown.pipe'; +import { MsToStringPipe } from '../../../../../ui/duration/ms-to-string.pipe'; +import { SortPipe } from '../../../../../ui/pipes/sort.pipe'; import { TranslatePipe } from '@ngx-translate/core'; -import { SnackService } from '../../../../../../core/snack/snack.service'; +import { SnackService } from '../../../../../core/snack/snack.service'; interface JiraSubtaskWithUrl extends JiraSubtask { href: string; diff --git a/src/app/features/issue/providers/jira/jira-api.service.ts b/src/app/features/issue/providers/jira/jira-api.service.ts index b332be68e0..664e31aa56 100644 --- a/src/app/features/issue/providers/jira/jira-api.service.ts +++ b/src/app/features/issue/providers/jira/jira-api.service.ts @@ -14,7 +14,7 @@ import { mapToSearchResults, mapToSearchResultsForJQL, mapTransitionResponse, -} from './issue/jira-issue-map.util'; +} from './jira-issue-map.util'; import { JiraOriginalStatus, JiraOriginalTransition, @@ -37,7 +37,7 @@ import { tap, timeoutWith, } from 'rxjs/operators'; -import { JiraIssue, JiraIssueReduced } from './issue/jira-issue.model'; +import { JiraIssue, JiraIssueReduced } from './jira-issue.model'; import moment from 'moment'; import { BannerService } from '../../../../core/banner/banner.service'; import { BannerId } from '../../../../core/banner/banner.model'; diff --git a/src/app/features/issue/providers/jira/jira-common-interfaces.service.ts b/src/app/features/issue/providers/jira/jira-common-interfaces.service.ts index 8c29dceba8..83b2b15381 100644 --- a/src/app/features/issue/providers/jira/jira-common-interfaces.service.ts +++ b/src/app/features/issue/providers/jira/jira-common-interfaces.service.ts @@ -5,9 +5,9 @@ import { first, map, switchMap, tap } from 'rxjs/operators'; import { IssueServiceInterface } from '../../issue-service-interface'; import { JiraApiService } from './jira-api.service'; import { IssueProviderJira, SearchResultItem } from '../../issue.model'; -import { JiraIssue, JiraIssueReduced } from './issue/jira-issue.model'; +import { JiraIssue, JiraIssueReduced } from './jira-issue.model'; import { TaskAttachment } from '../../../tasks/task-attachment/task-attachment.model'; -import { mapJiraAttachmentToAttachment } from './issue/jira-issue-map.util'; +import { mapJiraAttachmentToAttachment } from './jira-issue-map.util'; import { JiraCfg } from './jira.model'; import { isJiraEnabled } from './is-jira-enabled.util'; import { JIRA_POLL_INTERVAL } from './jira.const'; diff --git a/src/app/features/issue/providers/jira/jira-issue-content.const.ts b/src/app/features/issue/providers/jira/jira-issue-content.const.ts index c3c83b1ceb..56f827ba1b 100644 --- a/src/app/features/issue/providers/jira/jira-issue-content.const.ts +++ b/src/app/features/issue/providers/jira/jira-issue-content.const.ts @@ -3,7 +3,7 @@ import { IssueContentConfig, IssueFieldType, } from '../../issue-content/issue-content.model'; -import { JiraIssue } from './issue/jira-issue.model'; +import { JiraIssue } from './jira-issue.model'; export const JIRA_ISSUE_CONTENT_CONFIG: IssueContentConfig = { issueType: 'JIRA' as const, diff --git a/src/app/features/issue/providers/jira/issue/jira-issue-map.util.ts b/src/app/features/issue/providers/jira/jira-issue-map.util.ts similarity index 93% rename from src/app/features/issue/providers/jira/issue/jira-issue-map.util.ts rename to src/app/features/issue/providers/jira/jira-issue-map.util.ts index 4c9eef4090..ea1c09bd44 100644 --- a/src/app/features/issue/providers/jira/issue/jira-issue-map.util.ts +++ b/src/app/features/issue/providers/jira/jira-issue-map.util.ts @@ -16,16 +16,16 @@ import { JiraOriginalComment, JiraOriginalIssueLink, JiraOriginalLinkedIssue, -} from '../jira-api-responses'; -import { JiraCfg } from '../jira.model'; +} from './jira-api-responses'; +import { JiraCfg } from './jira.model'; import { DropPasteIcons, DropPasteInputType, -} from '../../../../../core/drop-paste-input/drop-paste.model'; -import { IssueProviderKey, SearchResultItem } from '../../../issue.model'; -import { TaskAttachment } from '../../../../tasks/task-attachment/task-attachment.model'; -import { dedupeByKey } from '../../../../../util/de-dupe-by-key'; -import { JIRA_TYPE } from '../../../issue.const'; +} from '../../../../core/drop-paste-input/drop-paste.model'; +import { IssueProviderKey, SearchResultItem } from '../../issue.model'; +import { TaskAttachment } from '../../../tasks/task-attachment/task-attachment.model'; +import { dedupeByKey } from '../../../../util/de-dupe-by-key'; +import { JIRA_TYPE } from '../../issue.const'; export const mapToSearchResults = (res: any): SearchResultItem[] => { console.log(res); diff --git a/src/app/features/issue/providers/jira/issue/jira-issue.effects.ts b/src/app/features/issue/providers/jira/jira-issue.effects.ts similarity index 90% rename from src/app/features/issue/providers/jira/issue/jira-issue.effects.ts rename to src/app/features/issue/providers/jira/jira-issue.effects.ts index e9fad38546..d3eb4e6bc5 100644 --- a/src/app/features/issue/providers/jira/issue/jira-issue.effects.ts +++ b/src/app/features/issue/providers/jira/jira-issue.effects.ts @@ -11,27 +11,27 @@ import { throttleTime, withLatestFrom, } from 'rxjs/operators'; -import { JiraApiService } from '../jira-api.service'; +import { JiraApiService } from './jira-api.service'; import { JiraIssueReduced } from './jira-issue.model'; -import { SnackService } from '../../../../../core/snack/snack.service'; -import { Task } from '../../../../tasks/task.model'; -import { TaskService } from '../../../../tasks/task.service'; +import { SnackService } from '../../../../core/snack/snack.service'; +import { Task } from '../../../tasks/task.model'; +import { TaskService } from '../../../tasks/task.service'; import { EMPTY, Observable, of, throwError, timer } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; -import { DialogJiraTransitionComponent } from '../jira-view-components/dialog-jira-transition/dialog-jira-transition.component'; -import { IssueLocalState, IssueProviderJira } from '../../../issue.model'; -import { IssueService } from '../../../issue.service'; -import { JIRA_TYPE } from '../../../issue.const'; -import { T } from '../../../../../t.const'; -import { JiraTransitionOption } from '../jira.model'; -import { setCurrentTask, updateTask } from '../../../../tasks/store/task.actions'; -import { DialogJiraAddWorklogComponent } from '../jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component'; -import { selectCurrentTaskParentOrCurrent } from '../../../../tasks/store/task.selectors'; -import { HANDLED_ERROR_PROP_STR } from '../../../../../app.constants'; -import { DialogConfirmComponent } from '../../../../../ui/dialog-confirm/dialog-confirm.component'; -import { isJiraEnabled } from '../is-jira-enabled.util'; -import { IssueProviderService } from '../../../issue-provider.service'; -import { assertTruthy } from '../../../../../util/assert-truthy'; +import { DialogJiraTransitionComponent } from './jira-view-components/dialog-jira-transition/dialog-jira-transition.component'; +import { IssueLocalState, IssueProviderJira } from '../../issue.model'; +import { IssueService } from '../../issue.service'; +import { JIRA_TYPE } from '../../issue.const'; +import { T } from '../../../../t.const'; +import { JiraTransitionOption } from './jira.model'; +import { setCurrentTask, updateTask } from '../../../tasks/store/task.actions'; +import { DialogJiraAddWorklogComponent } from './jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component'; +import { selectCurrentTaskParentOrCurrent } from '../../../tasks/store/task.selectors'; +import { HANDLED_ERROR_PROP_STR } from '../../../../app.constants'; +import { DialogConfirmComponent } from '../../../../ui/dialog-confirm/dialog-confirm.component'; +import { isJiraEnabled } from './is-jira-enabled.util'; +import { IssueProviderService } from '../../issue-provider.service'; +import { assertTruthy } from '../../../../util/assert-truthy'; @Injectable() export class JiraIssueEffects { diff --git a/src/app/features/issue/providers/jira/issue/jira-issue.model.ts b/src/app/features/issue/providers/jira/jira-issue.model.ts similarity index 95% rename from src/app/features/issue/providers/jira/issue/jira-issue.model.ts rename to src/app/features/issue/providers/jira/jira-issue.model.ts index cb3479360a..08c968ccb6 100644 --- a/src/app/features/issue/providers/jira/issue/jira-issue.model.ts +++ b/src/app/features/issue/providers/jira/jira-issue.model.ts @@ -1,6 +1,6 @@ // Mapped Data Types // ----------------- -import { JiraOriginalComponent, JiraOriginalStatus } from '../jira-api-responses'; +import { JiraOriginalComponent, JiraOriginalStatus } from './jira-api-responses'; export type JiraAuthor = Readonly<{ id: string; diff --git a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts index c24b4df785..e05c78c181 100644 --- a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts +++ b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts @@ -8,7 +8,7 @@ import { MatDialogActions, } from '@angular/material/dialog'; import { SnackService } from '../../../../../../core/snack/snack.service'; -import { JiraIssue } from '../../issue/jira-issue.model'; +import { JiraIssue } from '../../jira-issue.model'; import { Task } from '../../../../../tasks/task.model'; import { T } from '../../../../../../t.const'; import moment from 'moment'; diff --git a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts index cd8e8fe68b..6a313f0dac 100644 --- a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts +++ b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts @@ -7,7 +7,7 @@ import { MatDialogActions, } from '@angular/material/dialog'; import { IssueLocalState, IssueProviderJira } from '../../../../issue.model'; -import { JiraIssueReduced } from '../../issue/jira-issue.model'; +import { JiraIssueReduced } from '../../jira-issue.model'; import { Observable, of } from 'rxjs'; import { JiraApiService } from '../../jira-api.service'; import { JiraOriginalTransition } from '../../jira-api-responses'; diff --git a/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-additional-cfg.component.ts b/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-additional-cfg.component.ts index e331e6c580..4e928fd4b2 100644 --- a/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-additional-cfg.component.ts +++ b/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-additional-cfg.component.ts @@ -27,7 +27,7 @@ import { import { catchError, debounceTime, first, map, switchMap, tap } from 'rxjs/operators'; import { JiraApiService } from '../../jira-api.service'; import { DEFAULT_JIRA_CFG } from '../../jira.const'; -import { JiraIssue } from '../../issue/jira-issue.model'; +import { JiraIssue } from '../../jira-issue.model'; import { SnackService } from '../../../../../../core/snack/snack.service'; import { T } from '../../../../../../t.const'; import { HelperClasses } from '../../../../../../app.constants'; diff --git a/src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.html b/src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.html similarity index 100% rename from src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.html rename to src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.html diff --git a/src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.scss b/src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.scss similarity index 95% rename from src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.scss rename to src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.scss index 45224c9401..da02db736a 100644 --- a/src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.scss +++ b/src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.scss @@ -1,4 +1,4 @@ -@import '../../../../../../../variables'; +@import 'variables'; // table styled by ./src/styles/components/issue-table.scss diff --git a/src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.spec.ts b/src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.spec.ts similarity index 100% rename from src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.spec.ts rename to src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.spec.ts diff --git a/src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.ts b/src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.ts similarity index 86% rename from src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.ts rename to src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.ts index 9b9c2ce92d..92af424ef9 100644 --- a/src/app/features/issue/providers/open-project/issue/open-project-issue-content/open-project-issue-content.component.ts +++ b/src/app/features/issue/providers/open-project/OLD-open-project-issue-content/open-project-issue-content.component.ts @@ -6,21 +6,21 @@ import { inject, ChangeDetectorRef, } from '@angular/core'; -import { TaskWithSubTasks } from '../../../../../tasks/task.model'; +import { TaskWithSubTasks } from '../../../../tasks/task.model'; import { OpenProjectWorkPackage } from '../open-project-issue.model'; -import { expandAnimation } from '../../../../../../ui/animations/expand.ani'; -import { T } from '../../../../../../t.const'; -import { TaskService } from '../../../../../tasks/task.service'; +import { expandAnimation } from '../../../../../ui/animations/expand.ani'; +import { T } from '../../../../../t.const'; +import { TaskService } from '../../../../tasks/task.service'; import { MatButton } from '@angular/material/button'; import { MarkdownComponent } from 'ngx-markdown'; import { TranslatePipe } from '@ngx-translate/core'; import { MatIcon } from '@angular/material/icon'; -import { TaskAttachment } from '../../../../../tasks/task-attachment/task-attachment.model'; -import { IssueProviderService } from '../../../../issue-provider.service'; +import { TaskAttachment } from '../../../../tasks/task-attachment/task-attachment.model'; +import { IssueProviderService } from '../../../issue-provider.service'; import { mapOpenProjectAttachmentToTaskAttachment } from '../open-project-issue-map.util'; import { MatProgressBar } from '@angular/material/progress-bar'; -import { OpenProjectApiService } from '../../open-project-api.service'; -import { SnackService } from '../../../../../../core/snack/snack.service'; +import { OpenProjectApiService } from '../open-project-api.service'; +import { SnackService } from '../../../../../core/snack/snack.service'; import moment from 'moment'; @Component({ diff --git a/src/app/features/issue/providers/open-project/is-open-project-enabled.util.ts b/src/app/features/issue/providers/open-project/is-open-project-enabled.util.ts index 61b0df5bc9..3f5526bae8 100644 --- a/src/app/features/issue/providers/open-project/is-open-project-enabled.util.ts +++ b/src/app/features/issue/providers/open-project/is-open-project-enabled.util.ts @@ -2,6 +2,3 @@ import { OpenProjectCfg } from './open-project.model'; export const isOpenProjectEnabled = (cfg: OpenProjectCfg): boolean => !!cfg && cfg.isEnabled && !!cfg.host && !!cfg.token && !!cfg.projectId; - -export const isOpenProjectEnabledLegacy = (cfg: OpenProjectCfg): boolean => - !!cfg && !!cfg.host && !!cfg.token && !!cfg.projectId; diff --git a/src/app/features/issue/providers/open-project/open-project-api.service.ts b/src/app/features/issue/providers/open-project/open-project-api.service.ts index dc095eb666..334cabcbd5 100644 --- a/src/app/features/issue/providers/open-project/open-project-api.service.ts +++ b/src/app/features/issue/providers/open-project/open-project-api.service.ts @@ -13,12 +13,12 @@ import { mapOpenProjectIssueFull, mapOpenProjectIssueReduced, mapOpenProjectIssueToSearchResult, -} from './issue/open-project-issue-map.util'; +} from './open-project-issue-map.util'; import { OpenProjectAttachment, OpenProjectWorkPackage, OpenProjectWorkPackageReduced, -} from './issue/open-project-issue.model'; +} from './open-project-issue.model'; import { SearchResultItem } from '../../issue.model'; import { T } from '../../../../t.const'; import { throwHandledError } from '../../../../util/throw-handled-error'; diff --git a/src/app/features/issue/providers/open-project/open-project-common-interfaces.service.ts b/src/app/features/issue/providers/open-project/open-project-common-interfaces.service.ts index f2b318bfa0..10f5c85333 100644 --- a/src/app/features/issue/providers/open-project/open-project-common-interfaces.service.ts +++ b/src/app/features/issue/providers/open-project/open-project-common-interfaces.service.ts @@ -9,7 +9,7 @@ import { OpenProjectCfg } from './open-project.model'; import { OpenProjectWorkPackage, OpenProjectWorkPackageReduced, -} from './issue/open-project-issue.model'; +} from './open-project-issue.model'; import { isOpenProjectEnabled } from './is-open-project-enabled.util'; import { OPEN_PROJECT_POLL_INTERVAL } from './open-project.const'; import { parseOpenProjectDuration } from './open-project-view-components/parse-open-project-duration.util'; diff --git a/src/app/features/issue/providers/open-project/open-project-issue-content.const.ts b/src/app/features/issue/providers/open-project/open-project-issue-content.const.ts index 9c0062b671..42f0a84c25 100644 --- a/src/app/features/issue/providers/open-project/open-project-issue-content.const.ts +++ b/src/app/features/issue/providers/open-project/open-project-issue-content.const.ts @@ -4,7 +4,7 @@ import { IssueFieldType, } from '../../issue-content/issue-content.model'; import { IssueProviderKey } from '../../issue.model'; -import { OpenProjectWorkPackage } from './issue/open-project-issue.model'; +import { OpenProjectWorkPackage } from './open-project-issue.model'; export const OPEN_PROJECT_ISSUE_CONTENT_CONFIG: IssueContentConfig = { diff --git a/src/app/features/issue/providers/open-project/issue/open-project-issue-map.util.ts b/src/app/features/issue/providers/open-project/open-project-issue-map.util.ts similarity index 82% rename from src/app/features/issue/providers/open-project/issue/open-project-issue-map.util.ts rename to src/app/features/issue/providers/open-project/open-project-issue-map.util.ts index 1e03003b84..2c9a8bbf7d 100644 --- a/src/app/features/issue/providers/open-project/issue/open-project-issue-map.util.ts +++ b/src/app/features/issue/providers/open-project/open-project-issue-map.util.ts @@ -6,15 +6,15 @@ import { import { OpenProjectOriginalWorkPackageFull, OpenProjectOriginalWorkPackageReduced, -} from '../open-project-api-responses'; -import { SearchResultItem } from '../../../issue.model'; -import { OpenProjectCfg } from '../open-project.model'; -import { OPEN_PROJECT_TYPE } from '../../../issue.const'; +} from './open-project-api-responses'; +import { SearchResultItem } from '../../issue.model'; +import { OpenProjectCfg } from './open-project.model'; +import { OPEN_PROJECT_TYPE } from '../../issue.const'; import { TaskAttachment, TaskAttachmentCopy, -} from '../../../../tasks/task-attachment/task-attachment.model'; -import { DropPasteIcons } from '../../../../../core/drop-paste-input/drop-paste.model'; +} from '../../../tasks/task-attachment/task-attachment.model'; +import { DropPasteIcons } from '../../../../core/drop-paste-input/drop-paste.model'; export const mapOpenProjectIssueReduced = ( issue: OpenProjectOriginalWorkPackageReduced, diff --git a/src/app/features/issue/providers/open-project/issue/open-project-issue.model.ts b/src/app/features/issue/providers/open-project/open-project-issue.model.ts similarity index 94% rename from src/app/features/issue/providers/open-project/issue/open-project-issue.model.ts rename to src/app/features/issue/providers/open-project/open-project-issue.model.ts index 3f1b6baf91..925ac26fd6 100644 --- a/src/app/features/issue/providers/open-project/issue/open-project-issue.model.ts +++ b/src/app/features/issue/providers/open-project/open-project-issue.model.ts @@ -1,7 +1,7 @@ import { OpenProjectOriginalWorkPackageFull, OpenProjectOriginalWorkPackageReduced, -} from '../open-project-api-responses'; +} from './open-project-api-responses'; export interface OpenProjectAttachment { id: number; diff --git a/src/app/features/issue/providers/open-project/open-project-view-components/dialog-open-project-track-time/dialog-open-project-track-time.component.ts b/src/app/features/issue/providers/open-project/open-project-view-components/dialog-open-project-track-time/dialog-open-project-track-time.component.ts index b01ce80ae5..aea4fa1110 100644 --- a/src/app/features/issue/providers/open-project/open-project-view-components/dialog-open-project-track-time/dialog-open-project-track-time.component.ts +++ b/src/app/features/issue/providers/open-project/open-project-view-components/dialog-open-project-track-time/dialog-open-project-track-time.component.ts @@ -11,7 +11,7 @@ import { SnackService } from '../../../../../../core/snack/snack.service'; import { Task } from '../../../../../tasks/task.model'; import { T } from '../../../../../../t.const'; import moment from 'moment'; -import { OpenProjectWorkPackage } from '../../issue/open-project-issue.model'; +import { OpenProjectWorkPackage } from '../../open-project-issue.model'; import { parseOpenProjectDuration } from '../parse-open-project-duration.util'; import { JiraWorklogExportDefaultTime } from '../../../jira/jira.model'; import { diff --git a/src/app/features/issue/providers/open-project/open-project-view-components/dialog-openproject-transition/dialog-open-project-transition.component.ts b/src/app/features/issue/providers/open-project/open-project-view-components/dialog-openproject-transition/dialog-open-project-transition.component.ts index ad38baab43..6ff16bc200 100644 --- a/src/app/features/issue/providers/open-project/open-project-view-components/dialog-openproject-transition/dialog-open-project-transition.component.ts +++ b/src/app/features/issue/providers/open-project/open-project-view-components/dialog-openproject-transition/dialog-open-project-transition.component.ts @@ -18,7 +18,7 @@ import { T } from 'src/app/t.const'; import { Task } from '../../../../../tasks/task.model'; import { OpenProjectOriginalStatus } from '../../open-project-api-responses'; import { OpenProjectApiService } from '../../open-project-api.service'; -import { OpenProjectWorkPackage } from '../../issue/open-project-issue.model'; +import { OpenProjectWorkPackage } from '../../open-project-issue.model'; import { IssueProviderService } from 'src/app/features/issue/issue-provider.service'; import { assertTruthy } from '../../../../../../util/assert-truthy'; import { FormsModule } from '@angular/forms'; diff --git a/src/app/features/issue/providers/open-project/open-project-view-components/openproject-cfg/open-project-additional-cfg.component.ts b/src/app/features/issue/providers/open-project/open-project-view-components/openproject-cfg/open-project-additional-cfg.component.ts index 8adedeee30..71cb0afe42 100644 --- a/src/app/features/issue/providers/open-project/open-project-view-components/openproject-cfg/open-project-additional-cfg.component.ts +++ b/src/app/features/issue/providers/open-project/open-project-view-components/openproject-cfg/open-project-additional-cfg.component.ts @@ -29,7 +29,7 @@ import { OpenProjectApiService } from '../../open-project-api.service'; import { OpenProjectWorkPackage, OpenProjectWorkPackageReduced, -} from '../../issue/open-project-issue.model'; +} from '../../open-project-issue.model'; import { DEFAULT_OPEN_PROJECT_CFG } from '../../open-project.const'; import { OpenProjectTransitionConfig, diff --git a/src/app/features/issue/providers/open-project/issue/store/open-project.effects.spec.ts b/src/app/features/issue/providers/open-project/open-project.effects.spec.ts similarity index 100% rename from src/app/features/issue/providers/open-project/issue/store/open-project.effects.spec.ts rename to src/app/features/issue/providers/open-project/open-project.effects.spec.ts diff --git a/src/app/features/issue/providers/open-project/issue/store/open-project.effects.ts b/src/app/features/issue/providers/open-project/open-project.effects.ts similarity index 89% rename from src/app/features/issue/providers/open-project/issue/store/open-project.effects.ts rename to src/app/features/issue/providers/open-project/open-project.effects.ts index a201ddbeef..3ab069b8cc 100644 --- a/src/app/features/issue/providers/open-project/issue/store/open-project.effects.ts +++ b/src/app/features/issue/providers/open-project/open-project.effects.ts @@ -1,26 +1,26 @@ import { Injectable, inject } from '@angular/core'; import { Actions, createEffect, ofType } from '@ngrx/effects'; -import { setCurrentTask, updateTask } from '../../../../../tasks/store/task.actions'; +import { setCurrentTask, updateTask } from '../../../tasks/store/task.actions'; import { concatMap, filter, map, take, tap, withLatestFrom } from 'rxjs/operators'; import { select, Store } from '@ngrx/store'; -import { OPEN_PROJECT_TYPE } from '../../../../issue.const'; +import { OPEN_PROJECT_TYPE } from '../../issue.const'; import { MatDialog } from '@angular/material/dialog'; -import { Task } from '../../../../../tasks/task.model'; -import { OpenProjectCfg, OpenProjectTransitionOption } from '../../open-project.model'; +import { Task } from '../../../tasks/task.model'; +import { OpenProjectCfg, OpenProjectTransitionOption } from './open-project.model'; import { EMPTY, Observable, of, timer } from 'rxjs'; -import { DialogOpenProjectTrackTimeComponent } from '../../open-project-view-components/dialog-open-project-track-time/dialog-open-project-track-time.component'; -import { OpenProjectApiService } from '../../open-project-api.service'; -import { TaskService } from '../../../../../tasks/task.service'; +import { DialogOpenProjectTrackTimeComponent } from './open-project-view-components/dialog-open-project-track-time/dialog-open-project-track-time.component'; +import { OpenProjectApiService } from './open-project-api.service'; +import { TaskService } from '../../../tasks/task.service'; import { selectCurrentTaskParentOrCurrent } from 'src/app/features/tasks/store/task.selectors'; -import { isOpenProjectEnabled } from '../../is-open-project-enabled.util'; +import { isOpenProjectEnabled } from './is-open-project-enabled.util'; import { IssueLocalState } from 'src/app/features/issue/issue.model'; import { SnackService } from 'src/app/core/snack/snack.service'; -import { OpenProjectWorkPackage } from '../open-project-issue.model'; +import { OpenProjectWorkPackage } from './open-project-issue.model'; import { IssueService } from 'src/app/features/issue/issue.service'; import { T } from 'src/app/t.const'; -import { DialogOpenProjectTransitionComponent } from '../../open-project-view-components/dialog-openproject-transition/dialog-open-project-transition.component'; -import { IssueProviderService } from '../../../../issue-provider.service'; -import { assertTruthy } from '../../../../../../util/assert-truthy'; +import { DialogOpenProjectTransitionComponent } from './open-project-view-components/dialog-openproject-transition/dialog-open-project-transition.component'; +import { IssueProviderService } from '../../issue-provider.service'; +import { assertTruthy } from '../../../../util/assert-truthy'; @Injectable() export class OpenProjectEffects { diff --git a/src/app/features/issue/providers/redmine/issue/redmine-issue-content/redmine-issue-content.component.html b/src/app/features/issue/providers/redmine/OLD-redmine-issue-content/redmine-issue-content.component.html similarity index 100% rename from src/app/features/issue/providers/redmine/issue/redmine-issue-content/redmine-issue-content.component.html rename to src/app/features/issue/providers/redmine/OLD-redmine-issue-content/redmine-issue-content.component.html diff --git a/src/app/features/issue/providers/redmine/issue/redmine-issue-content/redmine-issue-content.component.scss b/src/app/features/issue/providers/redmine/OLD-redmine-issue-content/redmine-issue-content.component.scss similarity index 100% rename from src/app/features/issue/providers/redmine/issue/redmine-issue-content/redmine-issue-content.component.scss rename to src/app/features/issue/providers/redmine/OLD-redmine-issue-content/redmine-issue-content.component.scss diff --git a/src/app/features/issue/providers/redmine/issue/redmine-issue-content/redmine-issue-content.component.ts b/src/app/features/issue/providers/redmine/OLD-redmine-issue-content/redmine-issue-content.component.ts similarity index 100% rename from src/app/features/issue/providers/redmine/issue/redmine-issue-content/redmine-issue-content.component.ts rename to src/app/features/issue/providers/redmine/OLD-redmine-issue-content/redmine-issue-content.component.ts diff --git a/src/app/features/issue/providers/redmine/format-redmine-issue-subject.utils.ts b/src/app/features/issue/providers/redmine/format-redmine-issue-subject.utils.ts index 88f2ca3668..0d7c75b6be 100644 --- a/src/app/features/issue/providers/redmine/format-redmine-issue-subject.utils.ts +++ b/src/app/features/issue/providers/redmine/format-redmine-issue-subject.utils.ts @@ -1,4 +1,4 @@ -import { RedmineIssue } from './issue/redmine-issue.model'; +import { RedmineIssue } from './redmine-issue.model'; import { truncate } from '../../../../util/truncate'; export const formatRedmineIssueSubject = ({ id, subject }: RedmineIssue): string => { diff --git a/src/app/features/issue/providers/redmine/redmine-api.service.ts b/src/app/features/issue/providers/redmine/redmine-api.service.ts index 8511e7b38b..a15169cf31 100644 --- a/src/app/features/issue/providers/redmine/redmine-api.service.ts +++ b/src/app/features/issue/providers/redmine/redmine-api.service.ts @@ -12,8 +12,8 @@ import { RedmineIssueResult, RedmineSearchResult, RedmineSearchResultItem, -} from './issue/redmine-issue.model'; -import { mapRedmineSearchResultItemToSearchResult } from './issue/redmine-issue-map.util'; +} from './redmine-issue.model'; +import { mapRedmineSearchResultItemToSearchResult } from './redmine-issue-map.util'; import { SearchResultItem } from '../../issue.model'; import { ScopeOptions } from './redmine.const'; import { handleIssueProviderHttpError$ } from '../../handle-issue-provider-http-error'; diff --git a/src/app/features/issue/providers/redmine/redmine-common-interfaces.service.ts b/src/app/features/issue/providers/redmine/redmine-common-interfaces.service.ts index d39f9bc4b0..564310c7e1 100644 --- a/src/app/features/issue/providers/redmine/redmine-common-interfaces.service.ts +++ b/src/app/features/issue/providers/redmine/redmine-common-interfaces.service.ts @@ -17,7 +17,7 @@ import { import { RedmineCfg } from './redmine.model'; import { isRedmineEnabled } from './is-redmine-enabled.util'; import { RedmineApiService } from '../redmine/redmine-api.service'; -import { RedmineIssue } from './issue/redmine-issue.model'; +import { RedmineIssue } from './redmine-issue.model'; import { IssueProviderService } from '../../issue-provider.service'; @Injectable({ diff --git a/src/app/features/issue/providers/redmine/redmine-issue-content.const.ts b/src/app/features/issue/providers/redmine/redmine-issue-content.const.ts index d0ced5f0f7..5cca75fbca 100644 --- a/src/app/features/issue/providers/redmine/redmine-issue-content.const.ts +++ b/src/app/features/issue/providers/redmine/redmine-issue-content.const.ts @@ -3,7 +3,7 @@ import { IssueContentConfig, IssueFieldType, } from '../../issue-content/issue-content.model'; -import { RedmineIssue } from './issue/redmine-issue.model'; +import { RedmineIssue } from './redmine-issue.model'; import { IssueProviderKey } from '../../issue.model'; export const REDMINE_ISSUE_CONTENT_CONFIG: IssueContentConfig = { diff --git a/src/app/features/issue/providers/redmine/issue/redmine-issue-map.util.ts b/src/app/features/issue/providers/redmine/redmine-issue-map.util.ts similarity index 77% rename from src/app/features/issue/providers/redmine/issue/redmine-issue-map.util.ts rename to src/app/features/issue/providers/redmine/redmine-issue-map.util.ts index 3fdf64d01c..37f35d5fda 100644 --- a/src/app/features/issue/providers/redmine/issue/redmine-issue-map.util.ts +++ b/src/app/features/issue/providers/redmine/redmine-issue-map.util.ts @@ -1,8 +1,4 @@ -import { - IssueDataReduced, - IssueProviderKey, - SearchResultItem, -} from '../../../issue.model'; +import { IssueDataReduced, IssueProviderKey, SearchResultItem } from '../../issue.model'; import { RedmineSearchResultItem } from './redmine-issue.model'; export const mapRedmineSearchResultItemToSearchResult = ( diff --git a/src/app/features/issue/providers/redmine/issue/redmine-issue.model.ts b/src/app/features/issue/providers/redmine/redmine-issue.model.ts similarity index 100% rename from src/app/features/issue/providers/redmine/issue/redmine-issue.model.ts rename to src/app/features/issue/providers/redmine/redmine-issue.model.ts 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 8f875dfb58..4627cfc34e 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 @@ -161,7 +161,6 @@ #autoEl="matAutocomplete" (optionActivated)="onOptionActivated($event?.option?.value)" (optionSelected)="addTask()" - [displayWith]="displayWith" > @for ( item of filteredIssueSuggestions$ | async; diff --git a/src/app/features/tasks/add-task-bar/add-task-bar.component.ts b/src/app/features/tasks/add-task-bar/add-task-bar.component.ts index eda83b387b..eb1902b3d0 100644 --- a/src/app/features/tasks/add-task-bar/add-task-bar.component.ts +++ b/src/app/features/tasks/add-task-bar/add-task-bar.component.ts @@ -12,7 +12,6 @@ import { } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; import { TaskService } from '../task.service'; -import { JiraIssue } from '../../issue/providers/jira/jira-issue/jira-issue.model'; import { BehaviorSubject, Observable } from 'rxjs'; import { T } from '../../../t.const'; import { AddTaskSuggestion } from './add-task-suggestions.model'; @@ -255,10 +254,6 @@ export class AddTaskBarComponent implements AfterViewInit, OnDestroy { } } - displayWith(issue?: JiraIssue): string | undefined { - return issue?.summary; - } - async addTask(): Promise { this._isAddInProgress = true; const item: AddTaskSuggestion | string = this.taskSuggestionsCtrl.value; diff --git a/src/app/root-store/feature-stores.module.ts b/src/app/root-store/feature-stores.module.ts index d8b44d0739..7930249a7a 100644 --- a/src/app/root-store/feature-stores.module.ts +++ b/src/app/root-store/feature-stores.module.ts @@ -74,15 +74,15 @@ import { workContextReducer } from '../features/work-context/store/work-context. import { WorkContextEffects } from '../features/work-context/store/work-context.effects'; import { IS_ANDROID_WEB_VIEW } from '../util/is-android-web-view'; import { AndroidEffects } from '../features/android/store/android.effects'; -import { CaldavIssueEffects } from '../features/issue/providers/caldav/caldav-issue/caldav-issue.effects'; +import { CaldavIssueEffects } from '../features/issue/providers/caldav/caldav-issue.effects'; import { CalendarIntegrationEffects } from '../features/calendar-integration/store/calendar-integration.effects'; import { ElectronEffects } from '../core/electron/electron.effects'; import { DominaModeEffects } from '../features/domina-mode/store/domina-mode.effects'; import { DropboxEffects } from '../imex/sync/dropbox/store/dropbox.effects'; import { FinishDayBeforeCloseEffects } from '../features/finish-day-before-close/finish-day-before-close.effects'; -import { GitlabIssueEffects } from '../features/issue/providers/gitlab/gitlab-issue/gitlab-issue.effects'; -import { JiraIssueEffects } from '../features/issue/providers/jira/jira-issue/jira-issue.effects'; -import { OpenProjectEffects } from '../features/issue/providers/open-project/open-project-issue/store/open-project.effects'; +import { GitlabIssueEffects } from '../features/issue/providers/gitlab/gitlab-issue.effects'; +import { JiraIssueEffects } from '../features/issue/providers/jira/jira-issue.effects'; +import { OpenProjectEffects } from '../features/issue/providers/open-project/open-project.effects'; import { ReminderCountdownEffects } from '../features/reminder/store/reminder-countdown.effects'; import { SyncEffects } from '../imex/sync/sync.effects'; import { boardsFeature } from '../features/boards/store/boards.reducer';