Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-6713 try fix filter service imports

Browse Source
This commit is contained in:
Dan Percic 2023-07-06 14:21:46 +03:00
parent 269bd94cfe
commit 2355fe0375
43 changed files with 104 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/red-ui/src/app/app-routing.module.ts
View File

@ -1,12 +1,5 @@
import { AuthErrorComponent } from '@components/auth-error/auth-error.component';
import {
CompositeRouteGuard,
DEFAULT_REDIRECT_KEY,
ifNotLoggedIn,
IqserPermissionsGuard,
IqserRoutes,
TenantSelectComponent,
} from '@iqser/common-ui';
import { CompositeRouteGuard, DEFAULT_REDIRECT_KEY, IqserPermissionsGuard, IqserRoutes } from '@iqser/common-ui';
import { RedRoleGuard } from '@users/red-role.guard';
import { BaseScreenComponent } from '@components/base-screen/base-screen.component';
import { RouteReuseStrategy, RouterModule } from '@angular/router';
@ -27,6 +20,8 @@ import { mainResolver } from '@utils/main.resolver';
import { hasAnyRoleGuard, IqserAuthGuard } from '@iqser/common-ui/lib/users';
import { CustomRouteReuseStrategy } from '@iqser/common-ui/lib/utils';
import { ifLoggedIn } from '@guards/if-logged-in.guard';
import { ifNotLoggedIn } from '@guards/if-not-logged-in.guard';
import { TenantSelectComponent } from '@iqser/common-ui/lib/tenants';
const dossierTemplateIdRoutes: IqserRoutes = [
{
@ -210,7 +205,7 @@ const routes: IqserRoutes = [
{
path: '',
pathMatch: 'full',
canActivate: [ifNotLoggedIn],
canActivate: [ifNotLoggedIn()],
component: TenantSelectComponent,
},
{

9
apps/red-ui/src/app/app.module.ts
View File

@ -9,7 +9,6 @@ import {
CachingModule,
ChevronButtonComponent,
CircleButtonComponent,
CommonUiModule,
EmptyStateComponent,
HelpModeKey,
HiddenActionDirective,
@ -22,16 +21,11 @@ import {
IqserLoadingModule,
IqserTranslateModule,
LanguageService,
LogoComponent,
MAX_RETRIES_ON_SERVER_ERROR,
RoundCheckboxComponent,
SERVER_ERROR_SKIP_PATHS,
ServerErrorInterceptor,
SkeletonComponent,
StopPropagationDirective,
TenantPipe,
TenantsModule,
ToastComponent,
} from '@iqser/common-ui';
import { ToastrModule } from 'ngx-toastr';
import { ServiceWorkerModule } from '@angular/service-worker';
@ -71,6 +65,9 @@ import { UserMenuComponent } from '@components/user-menu/user-menu.component';
import { TenantsMenuComponent } from '@components/tenants-menu/tenants-menu.component';
import { MatDividerModule } from '@angular/material/divider';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { CommonUiModule } from '@iqser/common-ui/lib/common-ui.module';
import { LogoComponent, SkeletonComponent, ToastComponent } from '@iqser/common-ui/lib/shared';
import { TenantPipe, TenantsModule } from '@iqser/common-ui/lib/tenants';
export const appModuleFactory = (config: AppConfig) => {
@NgModule({

3
apps/red-ui/src/app/components/base-screen/base-screen.component.ts
View File

@ -6,7 +6,7 @@ import { Title } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { SpotlightSearchAction } from '@components/spotlight-search/spotlight-search-action';
import { filter, map, startWith } from 'rxjs/operators';
import { IqserPermissionsService, TenantsService } from '@iqser/common-ui';
import { IqserPermissionsService } from '@iqser/common-ui';
import { BreadcrumbsService } from '@services/breadcrumbs.service';
import { FeaturesService } from '@services/features.service';
import { ARCHIVE_ROUTE, DOSSIERS_ARCHIVE, DOSSIERS_ROUTE } from '@red/domain';
@ -14,6 +14,7 @@ import { Roles } from '@users/roles';
import { REDDocumentViewer } from '../../modules/pdf-viewer/services/document-viewer.service';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { List, shareDistinctLast } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
const isNavigationStart = event => event instanceof NavigationStart;
const isSearchScreen: (url: string) => boolean = url => url.includes('/search');

3
apps/red-ui/src/app/components/tenants-menu/tenants-menu.component.ts
View File

@ -1,9 +1,10 @@
import { Component, inject } from '@angular/core';
import { getConfig, getKeycloakOptions, IStoredTenantId, KeycloakStatusService, TenantsService } from '@iqser/common-ui';
import { getConfig } from '@iqser/common-ui';
import { User } from '@red/domain';
import { KeycloakService } from 'keycloak-angular';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { BASE_HREF } from '@iqser/common-ui/lib/utils';
import { getKeycloakOptions, IStoredTenantId, KeycloakStatusService, TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'app-tenants-menu',

3
apps/red-ui/src/app/components/user-menu/user-menu.component.ts
View File

@ -1,11 +1,12 @@
import { Component, inject } from '@angular/core';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { Roles } from '@users/roles';
import { IqserPermissionsService, TenantsService } from '@iqser/common-ui';
import { IqserPermissionsService } from '@iqser/common-ui';
import { User } from '@red/domain';
import { UserService } from '@users/user.service';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { List } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
interface MenuItem {
readonly id: string;

2
apps/red-ui/src/app/guards/dossier-files-guard.ts
View File

@ -7,7 +7,7 @@ import { DOSSIER_ID, DOSSIER_TEMPLATE_ID } from '@red/domain';
import { DossiersService } from '@services/dossiers/dossiers.service';
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { DossierDictionariesMapService } from '@services/entity-services/dossier-dictionaries-map.service';
import { TenantsService } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Injectable({ providedIn: 'root' })
export class DossierFilesGuard implements CanActivate {

2
apps/red-ui/src/app/guards/dossier-template-exists.guard.ts
View File

@ -2,7 +2,7 @@ import { inject } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router';
import { DOSSIER_TEMPLATE_ID } from '@red/domain';
import { DashboardStatsService } from '@services/dossier-templates/dashboard-stats.service';
import { TenantsService } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
import { NGXLogger } from 'ngx-logger';
import { firstValueFrom } from 'rxjs';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';

2
apps/red-ui/src/app/guards/dossiers.guard.ts
View File

@ -7,7 +7,7 @@ import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.se
import { DossiersService } from '@services/dossiers/dossiers.service';
import { ARCHIVE_ROUTE, DOSSIER_TEMPLATE_ID } from '@red/domain';
import { DashboardStatsService } from '@services/dossier-templates/dashboard-stats.service';
import { TenantsService } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Injectable({ providedIn: 'root' })
export class DossiersGuard implements CanActivate {

2
apps/red-ui/src/app/guards/entity-exists-guard.service.ts
View File

@ -3,7 +3,7 @@ import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router';
import { DOSSIER_TEMPLATE_ID, ENTITY_TYPE } from '@red/domain';
import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { TenantsService } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
export function entityExistsGuard(): CanActivateFn {
return async function (route: ActivatedRouteSnapshot): Promise<boolean> {

2
apps/red-ui/src/app/guards/if-logged-in.guard.ts
View File

@ -1,7 +1,7 @@
import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router';
import { inject } from '@angular/core';
import { NGXLogger } from 'ngx-logger';
import { keycloakInitializer, KeycloakStatusService, TenantsService } from '@iqser/common-ui';
import { keycloakInitializer, KeycloakStatusService, TenantsService } from '@iqser/common-ui/lib/tenants';
import { KeycloakService } from 'keycloak-angular';
import { UserService } from '@users/user.service';

29
apps/red-ui/src/app/guards/if-not-logged-in.guard.ts Normal file
View File

@ -0,0 +1,29 @@
import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router';
import { inject } from '@angular/core';
import { NGXLogger } from 'ngx-logger';
import { KeycloakService } from 'keycloak-angular';
export function ifNotLoggedIn(): CanActivateFn {
return async (route: ActivatedRouteSnapshot) => {
const logger = inject(NGXLogger);
const router = inject(Router);
const keycloakService = inject(KeycloakService);
const isLoggedIn = await keycloakService.isLoggedIn();
if (!isLoggedIn) {
logger.info('[ROUTES] Not logged in, continuing to selected route');
return true;
}
const tenant = route.paramMap.get('tenant') || keycloakService.getKeycloakInstance().realm;
if (!tenant) {
logger.error('[ROUTES] Tenant not found in route or keycloak realm');
return false;
}
logger.warn('[ROUTES] Is logged in for ' + tenant + ', redirecting to /' + tenant);
await router.navigate([tenant]);
return false;
};
}

2
apps/red-ui/src/app/guards/watermark-exists.guard.ts
View File

@ -2,7 +2,7 @@ import { inject } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router';
import { WatermarksMapService } from '@services/entity-services/watermarks-map.service';
import { DOSSIER_TEMPLATE_ID, WATERMARK_ID } from '@red/domain';
import { TenantsService } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
export function watermarkExistsGuard(): CanActivateFn {
return async function (route: ActivatedRouteSnapshot) {

3
apps/red-ui/src/app/modules/account/account.module.ts
View File

@ -6,8 +6,9 @@ import { AccountSideNavComponent } from './account-side-nav/account-side-nav.com
import { BaseAccountScreenComponent } from './base-account-screen/base-account-screen-component';
import { NotificationPreferencesService } from './services/notification-preferences.service';
import { TranslateModule } from '@ngx-translate/core';
import { IconButtonComponent, IqserHelpModeModule, SideNavComponent } from '@iqser/common-ui';
import { IconButtonComponent, IqserHelpModeModule } from '@iqser/common-ui';
import { PreferencesComponent } from './screens/preferences/preferences.component';
import { SideNavComponent } from '@iqser/common-ui/lib/shared';
@NgModule({
declarations: [AccountSideNavComponent, BaseAccountScreenComponent, PreferencesComponent],

14
apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
View File

@ -2,15 +2,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit }
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { DomSanitizer } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import {
BaseFormComponent,
getConfig,
IqserPermissionsService,
LanguageService,
LoadingService,
TenantsService,
Toaster,
} from '@iqser/common-ui';
import { BaseFormComponent, getConfig, IqserPermissionsService, LanguageService, LoadingService, Toaster } from '@iqser/common-ui';
import { AppConfig, IProfile } from '@red/domain';
import { languagesTranslations } from '@translations/languages-translations';
import { UserService } from '@users/user.service';
@ -19,6 +11,7 @@ import { UserPreferenceService } from '@users/user-preference.service';
import { Roles } from '@users/roles';
import { UserProfileDialogService } from '../services/user-profile-dialog.service';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
templateUrl: './user-profile-screen.component.html',
@ -26,12 +19,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class UserProfileScreenComponent extends BaseFormComponent implements OnInit {
#profileModel: IProfile;
readonly translations = languagesTranslations;
readonly devMode = this._userPreferenceService.areDevFeaturesEnabled;
readonly changePasswordUrl: string;
#profileModel: IProfile;
constructor(
domSanitizer: DomSanitizer,
private readonly _userService: UserService,

2
apps/red-ui/src/app/modules/admin/admin.module.ts
View File

@ -50,12 +50,12 @@ import {
IqserListingModule,
IqserUploadFileModule,
RoundCheckboxComponent,
TenantPipe,
} from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
import { AuditInfoDialogComponent } from './dialogs/audit-info-dialog/audit-info-dialog.component';
import { DossierTemplateActionsComponent } from './shared/components/dossier-template-actions/dossier-template-actions.component';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
const dialogs = [
AddEditCloneDossierTemplateDialogComponent,

3
apps/red-ui/src/app/modules/admin/base-entity-screen/base-entity-screen.component.ts
View File

@ -4,12 +4,13 @@ import { Router } from '@angular/router';
import { firstValueFrom, Observable } from 'rxjs';
import { AdminDialogService } from '../services/admin-dialog.service';
import { DictionaryService } from '@services/entity-services/dictionary.service';
import { LoadingService, TenantsService } from '@iqser/common-ui';
import { LoadingService } from '@iqser/common-ui';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
import { map } from 'rxjs/operators';
import { PermissionsService } from '@services/permissions.service';
import { getParam } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
templateUrl: './base-entity-screen.component.html',

3
apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
View File

@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, ElementRef, inject, OnInit, ViewChild } f
import WebViewer, { WebViewerInstance } from '@pdftron/webviewer';
import { HttpClient } from '@angular/common/http';
import { FormBuilder, FormGroup } from '@angular/forms';
import { getConfig, IconButtonTypes, IqserPermissionsService, LoadingService, TenantsService, Toaster } from '@iqser/common-ui';
import { getConfig, IconButtonTypes, IqserPermissionsService, LoadingService, Toaster } from '@iqser/common-ui';
import {
AppConfig,
DOSSIER_TEMPLATE_ID,
@ -31,6 +31,7 @@ import { tap } from 'rxjs/operators';
import { watermarkTranslations } from '@translations/watermark-translations';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { AsControl, BASE_HREF_FN, Debounce, getParam, trackByFactory } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
export const DEFAULT_WATERMARK: Partial<IWatermark> = {
text: 'Watermark',

2
apps/red-ui/src/app/modules/admin/screens/watermark/watermark.module.ts
View File

@ -12,7 +12,6 @@ import {
IqserHelpModeModule,
IqserListingModule,
IqserRoutes,
TenantPipe,
} from '@iqser/common-ui';
import { RedRoleGuard } from '@users/red-role.guard';
import { WATERMARK_ID } from '@red/domain';
@ -26,6 +25,7 @@ import { ColorPickerModule } from 'ngx-color-picker';
import { MatTooltipModule } from '@angular/material/tooltip';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { IqserAuthGuard, IqserUsersModule } from '@iqser/common-ui/lib/users';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
const routes: IqserRoutes = [
{

4
apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
View File

@ -5,10 +5,12 @@ import { adminSideNavTranslations } from '@translations/admin-side-nav-translati
import { ActivatedRoute, RouterLink, RouterLinkActive } from '@angular/router';
import { AdminSideNavType, AdminSideNavTypes, DOSSIER_TEMPLATE_ID, ENTITY_TYPE, User, WATERMARK_ID } from '@red/domain';
import { Roles } from '@users/roles';
import { IqserHelpModeModule, IqserPermissionsService, SideNavComponent, TenantPipe } from '@iqser/common-ui';
import { IqserHelpModeModule, IqserPermissionsService } from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
import { NgForOf, NgIf } from '@angular/common';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { SideNavComponent } from '@iqser/common-ui/lib/shared';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
interface NavItem {
readonly label: string;

3
apps/red-ui/src/app/modules/admin/shared/components/dossier-template-actions/dossier-template-actions.component.ts
View File

@ -1,13 +1,14 @@
import { Component, Input, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { AdminDialogService } from '../../../services/admin-dialog.service';
import { CircleButtonComponent, CircleButtonTypes, IqserHelpModeModule, LoadingService, TenantsService } from '@iqser/common-ui';
import { CircleButtonComponent, CircleButtonTypes, IqserHelpModeModule, LoadingService } from '@iqser/common-ui';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { firstValueFrom } from 'rxjs';
import { DOSSIER_TEMPLATE_ID, type User } from '@red/domain';
import { NgIf } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'redaction-dossier-template-actions',

2
apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts
View File

@ -8,7 +8,7 @@ import { DictionariesMapService } from '@services/entity-services/dictionaries-m
import { AsyncPipe, NgIf } from '@angular/common';
import { MatIconModule } from '@angular/material/icon';
import { TranslateModule } from '@ngx-translate/core';
import { TenantPipe } from '@iqser/common-ui';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'redaction-dossier-template-breadcrumbs',

11
apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.ts
View File

@ -1,13 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import {
ActionConfig,
CircleButtonTypes,
EntitiesService,
ListingService,
LoadingService,
TenantsService,
Toaster,
} from '@iqser/common-ui';
import { ActionConfig, CircleButtonTypes, EntitiesService, ListingService, LoadingService, Toaster } from '@iqser/common-ui';
import { Dossier, File, IFile } from '@red/domain';
import { PermissionsService } from '@services/permissions.service';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
@ -21,6 +13,7 @@ import { Router } from '@angular/router';
import { Roles } from '@users/roles';
import { SortingService } from '@iqser/common-ui/lib/sorting';
import { List, some } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'redaction-dossier-overview-screen-header [dossier] [upload]',

4
apps/red-ui/src/app/modules/dossier-overview/dossier-overview.module.ts
View File

@ -10,9 +10,7 @@ import {
IqserListingModule,
IqserLoadingModule,
IqserRoutes,
StatusBarComponent,
StopPropagationDirective,
TenantPipe,
} from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
import { DossierOverviewScreenComponent } from './screen/dossier-overview-screen.component';
@ -28,6 +26,8 @@ import { ViewModeSelectionComponent } from './components/view-mode-selection/vie
import { FileAttributeComponent } from './components/file-attribute/file-attribute.component';
import { SharedModule } from '@shared/shared.module';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { StatusBarComponent } from '@iqser/common-ui/lib/shared';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
const routes: IqserRoutes = [
{

2
apps/red-ui/src/app/modules/dossiers-listing/components/dossier-documents-status/dossier-documents-status.component.ts
View File

@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
import { DossierStats, StatusSorter } from '@red/domain';
import { StatusBarConfig } from '@iqser/common-ui';
import { List } from '@iqser/common-ui/lib/utils';
import { StatusBarConfig } from '@iqser/common-ui/lib/shared';
@Component({
selector: 'redaction-dossier-documents-status',

10
apps/red-ui/src/app/modules/dossiers-listing/dossiers-listing.module.ts
View File

@ -1,13 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
CompositeRouteGuard,
HasScrollbarDirective,
IqserHelpModeModule,
IqserListingModule,
IqserRoutes,
StatusBarComponent,
} from '@iqser/common-ui';
import { CompositeRouteGuard, HasScrollbarDirective, IqserHelpModeModule, IqserListingModule, IqserRoutes } from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
import { DossiersListingScreenComponent } from './screen/dossiers-listing-screen.component';
import { RouterModule } from '@angular/router';
@ -21,6 +14,7 @@ import { DossierDocumentsStatusComponent } from './components/dossier-documents-
import { DossierFilesGuard } from '@guards/dossier-files-guard';
import { ACTIVE_DOSSIERS_SERVICE } from '../../tokens';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { StatusBarComponent } from '@iqser/common-ui/lib/shared';
const routes: IqserRoutes = [
{

2
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -21,7 +21,6 @@ import {
HelpModeService,
IConfirmationDialogData,
LoadingService,
TenantsService,
Toaster,
} from '@iqser/common-ui';
import { MatDialog } from '@angular/material/dialog';
@ -69,6 +68,7 @@ import { RedactTextDialogComponent } from './dialogs/redact-text-dialog/redact-t
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { copyLocalStorageFiltersValues, FilterService, NestedFilter, processFilters } from '@iqser/common-ui/lib/filtering';
import { AutoUnsubscribe, Bind, bool, Debounce, List, OnAttach, OnDetach } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
const textActions = [TextPopups.REDACT_TEXT, TextPopups.ADD_HINT, TextPopups.ADD_FALSE_POSITIVE];

4
apps/red-ui/src/app/modules/file-preview/file-preview.module.ts
View File

@ -18,9 +18,7 @@ import {
LogPipe,
PreventDefaultDirective,
RoundCheckboxComponent,
StatusBarComponent,
StopPropagationDirective,
TenantPipe,
} from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
import { RouterModule } from '@angular/router';
@ -66,6 +64,8 @@ import { RedactTextDialogComponent } from './dialogs/redact-text-dialog/redact-t
import { RemoveRedactionDialogComponent } from './dialogs/remove-redaction-dialog/remove-redaction-dialog.component';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { IqserFiltersModule } from '@iqser/common-ui/lib/filtering';
import { StatusBarComponent } from '@iqser/common-ui/lib/shared';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
const routes: IqserRoutes = [
{

4
apps/red-ui/src/app/modules/search/search.module.ts
View File

@ -2,11 +2,13 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SearchScreenComponent } from './search-screen/search-screen.component';
import { RouterModule } from '@angular/router';
import { IqserListingModule, StatusBarComponent, StopPropagationDirective, TenantPipe } from '@iqser/common-ui';
import { IqserListingModule, StopPropagationDirective } from '@iqser/common-ui';
import { SharedModule } from '@shared/shared.module';
import { TranslateModule } from '@ngx-translate/core';
import { SearchItemTemplateComponent } from './search-item-template/search-item-template.component';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { StatusBarComponent } from '@iqser/common-ui/lib/shared';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
const routes = [{ path: '', component: SearchScreenComponent }];

2
apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts
View File

@ -8,7 +8,6 @@ import {
IConfirmationDialogData,
IqserPermissionsService,
LoadingService,
TenantsService,
Toaster,
} from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
@ -33,6 +32,7 @@ import { toObservable } from '@angular/core/rxjs-interop';
import { setLocalStorageDataByFileId } from '@utils/local-storage';
import { getCurrentUser } from '@iqser/common-ui/lib/users';
import { IqserTooltipPositions } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'redaction-file-actions',

11
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/general-info/edit-dossier-general-info.component.ts
View File

@ -7,15 +7,7 @@ import { PermissionsService } from '@services/permissions.service';
import { Router } from '@angular/router';
import { MatDialogRef } from '@angular/material/dialog';
import { EditDossierDialogComponent } from '../edit-dossier-dialog.component';
import {
ConfirmOptions,
IconButtonTypes,
IConfirmationDialogData,
LoadingService,
TenantsService,
TitleColors,
Toaster,
} from '@iqser/common-ui';
import { ConfirmOptions, IconButtonTypes, IConfirmationDialogData, LoadingService, TitleColors, Toaster } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { DossierStatsService } from '@services/dossiers/dossier-stats.service';
@ -27,6 +19,7 @@ import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.se
import { DossierStatesMapService } from '@services/entity-services/dossier-states-map.service';
import dayjs from 'dayjs';
import { dateWithoutTime } from '@utils/functions';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'redaction-edit-dossier-general-info',

4
apps/red-ui/src/app/modules/shared-dossiers/shared-dossiers.module.ts
View File

@ -23,14 +23,12 @@ import {
IqserDenyDirective,
IqserHelpModeModule,
RoundCheckboxComponent,
SideNavComponent,
SmallChipComponent,
StatusBarComponent,
StopPropagationDirective,
} from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
import { DossiersListingActionsComponent } from './components/dossiers-listing-actions/dossiers-listing-actions.component';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { SideNavComponent, SmallChipComponent, StatusBarComponent } from '@iqser/common-ui/lib/shared';
const components = [
FileActionsComponent,

3
apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
View File

@ -2,9 +2,10 @@ import { Component, Input, OnChanges } from '@angular/core';
import { PermissionsService } from '@services/permissions.service';
import { Dossier, File, ProcessingFileStatuses } from '@red/domain';
import { FileDownloadService } from '@upload-download/services/file-download.service';
import { CircleButtonType, CircleButtonTypes, IqserDialog, TenantsService, Toaster } from '@iqser/common-ui';
import { CircleButtonType, CircleButtonTypes, IqserDialog, Toaster } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { DownloadDialogComponent } from '@shared/dialogs/download-dialog/download-dialog.component';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'redaction-file-download-btn',

3
apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.ts
View File

@ -1,12 +1,13 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Optional, Output } from '@angular/core';
import { DonutChartConfig } from '@red/domain';
import { IqserHelpModeModule, StatusBarComponent } from '@iqser/common-ui';
import { IqserHelpModeModule } from '@iqser/common-ui';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
import { MatSelectModule } from '@angular/material/select';
import { FilterService, INestedFilter } from '@iqser/common-ui/lib/filtering';
import { get, shareLast } from '@iqser/common-ui/lib/utils';
import { StatusBarComponent } from '@iqser/common-ui/lib/shared';
@Component({
selector: 'redaction-donut-chart',

3
apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.ts
View File

@ -1,12 +1,13 @@
import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
import { Action, ActionTypes, Dossier, File } from '@red/domain';
import { CircleButtonType, IqserDialog, TenantsService, Toaster } from '@iqser/common-ui';
import { CircleButtonType, IqserDialog, Toaster } from '@iqser/common-ui';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { FileDownloadService } from '@upload-download/services/file-download.service';
import { PermissionsService } from '@services/permissions.service';
import { MatMenuTrigger } from '@angular/material/menu';
import { DownloadDialogComponent } from '@shared/dialogs/download-dialog/download-dialog.component';
import { IqserTooltipPosition, trackByFactory } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Component({
selector: 'redaction-expandable-file-actions',

3
apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts
View File

@ -3,7 +3,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { DOSSIER_TEMPLATE_ID, DownloadFileType, IDossierRequest, IDossierTemplate, IReportTemplate } from '@red/domain';
import { UntypedFormGroup, Validators } from '@angular/forms';
import { downloadTypesTranslations } from '@translations/download-types-translations';
import { BaseDialogComponent, IconButtonTypes, IqserPermissionsService, SaveOptions, TenantsService } from '@iqser/common-ui';
import { BaseDialogComponent, IconButtonTypes, IqserPermissionsService, SaveOptions } from '@iqser/common-ui';
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { ReportTemplateService } from '@services/report-template.service';
@ -12,6 +12,7 @@ import dayjs from 'dayjs';
import { Router } from '@angular/router';
import { DossiersDialogService } from '../../../shared-dossiers/services/dossiers-dialog.service';
import { Roles } from '@users/roles';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
interface DialogData {
readonly dossierTemplateId?: string;

2
apps/red-ui/src/app/modules/shared/shared.module.ts
View File

@ -15,7 +15,6 @@ import {
IqserAllowDirective,
IqserDenyDirective,
IqserHelpModeModule,
SmallChipComponent,
StopPropagationDirective,
} from '@iqser/common-ui';
import { SelectComponent } from './components/select/select.component';
@ -47,6 +46,7 @@ import { OcrProgressBarComponent } from './components/ocr-progress-bar/ocr-progr
import { DownloadDialogComponent } from './dialogs/download-dialog/download-dialog.component';
import { CustomDateAdapter } from '@shared/CustomDateAdapter';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { SmallChipComponent } from '@iqser/common-ui/lib/shared';
const buttons = [FileDownloadBtnComponent];

3
apps/red-ui/src/app/modules/trash/trash.module.ts
View File

@ -2,12 +2,13 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { TrashScreenComponent } from './trash-screen/trash-screen.component';
import { CircleButtonComponent, IqserListingModule, TenantPipe } from '@iqser/common-ui';
import { CircleButtonComponent, IqserListingModule } from '@iqser/common-ui';
import { TrashTableItemComponent } from './trash-screen/trash-table-item/trash-table-item.component';
import { SharedModule } from '@shared/shared.module';
import { TrashDialogService } from './services/trash-dialog.service';
import { TranslateModule } from '@ngx-translate/core';
import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { TenantPipe } from '@iqser/common-ui/lib/tenants';
const routes = [{ path: '', component: TrashScreenComponent }];

3
apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts
View File

@ -3,9 +3,10 @@ import { DownloadStatus, IDownloadStatus, IDownloadStatusResponse, IPrepareDownl
import { firstValueFrom, Observable } from 'rxjs';
import { ConfigService } from '@services/config.service';
import { map, tap } from 'rxjs/operators';
import { EntitiesService, TenantsService } from '@iqser/common-ui';
import { EntitiesService } from '@iqser/common-ui';
import { NGXLogger } from 'ngx-logger';
import { mapEach } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Injectable()
export class FileDownloadService extends EntitiesService<IDownloadStatus, DownloadStatus> {

7
apps/red-ui/src/app/services/dossiers/archived-dossiers.service.ts
View File

@ -8,18 +8,17 @@ import { DossiersService } from './dossiers.service';
import { FilesMapService } from '../files/files-map.service';
import { FeaturesService } from '../features.service';
import { Router } from '@angular/router';
import { TenantsService } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
@Injectable({ providedIn: 'root' })
export class ArchivedDossiersService extends DossiersService {
readonly routerPath = ARCHIVE_ROUTE;
protected readonly _defaultModelPath = 'archived-dossiers';
readonly #activeDossiersService = inject(ActiveDossiersService);
readonly #filesMapService = inject(FilesMapService);
readonly #featuresService = inject(FeaturesService);
readonly #tenantsService = inject(TenantsService);
readonly #router = inject(Router);
protected readonly _defaultModelPath = 'archived-dossiers';
readonly routerPath = ARCHIVE_ROUTE;
archive(dossiers: Dossier[]): Observable<unknown> {
const showArchiveFailedToast = () => {

3
apps/red-ui/src/app/services/notifications.service.ts
View File

@ -1,5 +1,5 @@
import { Inject, Injectable, OnDestroy } from '@angular/core';
import { EntitiesService, getConfig, QueryParam, TenantsService } from '@iqser/common-ui';
import { EntitiesService, getConfig, QueryParam } from '@iqser/common-ui';
import { TranslateService } from '@ngx-translate/core';
import { EMPTY, firstValueFrom, iif, merge, Observable, of, Subscription, timer } from 'rxjs';
import { AppConfig, Dossier, INotification, Notification, NotificationTypes } from '@red/domain';
@ -11,6 +11,7 @@ import { CHANGED_CHECK_INTERVAL } from '@utils/constants';
import { DossiersCacheService } from './dossiers/dossiers-cache.service';
import dayjs from 'dayjs';
import { BASE_HREF, List, mapEach } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
const INCLUDE_SEEN = false;

2
apps/red-ui/src/app/services/router-history.service.ts
View File

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
import { filter } from 'rxjs/operators';
import { TenantsService } from '@iqser/common-ui';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
const LAST_DOSSIERS_SCREEN = 'routerHistory_lastDossiersScreen';

3
apps/red-ui/src/app/utils/main.resolver.ts
View File

@ -5,7 +5,7 @@ import { UserService } from '@users/user.service';
import { SystemPreferencesService } from '@services/system-preferences.service';
import { UserPreferenceService } from '@users/user-preference.service';
import { LicenseService } from '@services/license.service';
import { IqserPermissionsService, LoadingService, TenantsService } from '@iqser/common-ui';
import { IqserPermissionsService, LoadingService } from '@iqser/common-ui';
import { FeaturesService } from '@services/features.service';
import { GeneralSettingsService } from '@services/general-settings.service';
import { tap } from 'rxjs/operators';
@ -14,6 +14,7 @@ import { Roles } from '@users/roles';
import { DossiersChangesService } from '@services/dossiers/dossier-changes.service';
import { ResolveFn } from '@angular/router';
import { BASE_HREF } from '@iqser/common-ui/lib/utils';
import { TenantsService } from '@iqser/common-ui/lib/tenants';
function redirectToLastDossierTemplate(baseHref: string, tenant: string, lastDossierTemplate: string) {
const lastUrlSegment = window.location.pathname.split('/').filter(Boolean).pop();

2
libs/common-ui

@ -1 +1 @@
Subproject commit 8ac4bbfd9fa98c9172bf2040c763cb934d7f00a7
Subproject commit a71e094e55efda38556f4a6e131051996f2dbdc1