Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Fix imports, no longer exported types

Alexander Brandon Colesc6a7e5d3425d
diff --git a/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts
index 6561bd0fb6b..9f230cf1ce3 100644
--- a/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/create-autocompleter/create-autocompleter.component.ts
@@ -42,13 +42,15 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
import { HalResource } from 'core-app/features/hal/resources/hal-resource';
-import { AddTagFn } from '@ng-select/ng-select/lib/ng-select.component';
import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
import { Subject } from 'rxjs';
import { compareByHref } from 'core-app/shared/helpers/angular/tracking-functions';
import { repositionDropdownBugfix } from 'core-app/shared/components/autocompleter/op-autocompleter/autocompleter.helper';
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-redundant-type-constituents
+type AddTagFn = (term:string) => any | Promise<any>;
+
export interface CreateAutocompleterValueOption {
name:string;
href:string|null;
diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts
index bc57ca1bc6f..4a17549fb9e 100644
--- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts
@@ -26,7 +26,6 @@ import {
import { DropdownPosition, NgSelectComponent } from '@ng-select/ng-select';
import { BehaviorSubject, merge, NEVER, Observable, of, Subject } from 'rxjs';
import { debounceTime, distinctUntilChanged, filter, switchMap, tap } from 'rxjs/operators';
-import { AddTagFn, GroupValueFn } from '@ng-select/ng-select/lib/ng-select.component';
import { HalResource } from 'core-app/features/hal/resources/hal-resource';
import {
@@ -71,6 +70,11 @@ export interface IAutocompleterTemplateComponent {
footerTemplate?:TemplateRef<Element>;
}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-redundant-type-constituents
+type AddTagFn = (term:string) => any | Promise<any>;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-redundant-type-constituents
+type GroupValueFn = (key:string | any, children:any[]) => string | any;
+
@Component({
selector: 'op-autocompleter',
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts
index 1e4b3822b9c..b1c38fcfdc6 100644
--- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts
+++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts
@@ -1,5 +1,5 @@
import { NgSelectModule } from '@ng-select/ng-select';
-import { NgOptionHighlightModule } from '@ng-select/ng-option-highlight';
+import { NgOptionHighlightDirective } from '@ng-select/ng-option-highlight';
import {
Component,
forwardRef,
@@ -334,7 +334,7 @@ describe('DynamicFormComponent', () => {
],
}),
NgSelectModule,
- NgOptionHighlightModule],
+ NgOptionHighlightDirective],
providers: [
DynamicFieldsService,
{ provide: I18nService, useValue: I18nServiceStub },
diff --git a/frontend/src/app/shared/components/dynamic-forms/dynamic-forms.module.ts b/frontend/src/app/shared/components/dynamic-forms/dynamic-forms.module.ts
index 7024e3fb3b2..f0bfc9d6388 100644
--- a/frontend/src/app/shared/components/dynamic-forms/dynamic-forms.module.ts
+++ b/frontend/src/app/shared/components/dynamic-forms/dynamic-forms.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormlyModule } from '@ngx-formly/core';
-import { NgOptionHighlightModule } from '@ng-select/ng-option-highlight';
+import { NgOptionHighlightDirective } from '@ng-select/ng-option-highlight';
import { NgSelectModule } from '@ng-select/ng-select';
import {
FormsModule,
@@ -59,7 +59,7 @@ import { OpSpotModule } from 'core-app/spot/spot.module';
// Input dependencies
FormsModule,
NgSelectModule,
- NgOptionHighlightModule,
+ NgOptionHighlightDirective,
InviteUserButtonModule,
FormattableControlModule,
],
diff --git a/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts b/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts
index 673c2414831..9ef5e4c2b77 100644
--- a/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts
+++ b/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts
@@ -11,7 +11,7 @@ import { DateInputComponent } from 'core-app/shared/components/dynamic-forms/com
import { FormattableTextareaInputComponent } from 'core-app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/formattable-textarea-input.component';
import { DynamicFieldGroupWrapperComponent } from 'core-app/shared/components/dynamic-forms/components/dynamic-field-group-wrapper/dynamic-field-group-wrapper.component';
import { NgSelectModule } from '@ng-select/ng-select';
-import { NgOptionHighlightModule } from '@ng-select/ng-option-highlight';
+import { NgOptionHighlightDirective } from '@ng-select/ng-option-highlight';
import { FormlyForm, FormlyModule } from '@ngx-formly/core';
import { IOPFormlyFieldSettings } from 'core-app/shared/components/dynamic-forms/typings';
@@ -107,7 +107,7 @@ export function createDynamicInputFixture(fields:IOPFormlyFieldSettings[], model
],
}),
NgSelectModule,
- NgOptionHighlightModule,
+ NgOptionHighlightDirective,
],
declarations: [
TextInputComponent,
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 4e6a97d75ed..5e34d482843 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -33,7 +33,7 @@ import { NgSelectModule } from '@ng-select/ng-select';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { PortalModule } from '@angular/cdk/portal';
import { CommonModule } from '@angular/common';
-import { NgOptionHighlightModule } from '@ng-select/ng-option-highlight';
+import { NgOptionHighlightDirective } from '@ng-select/ng-option-highlight';
import { DragulaModule } from 'ng2-dragula';
import { DynamicModule } from 'ng-dynamic-component';
import { UIRouterModule } from '@uirouter/angular';
@@ -114,7 +114,7 @@ export function bootstrapModule(injector:Injector):void {
CurrentUserModule,
FormsModule,
NgSelectModule,
- NgOptionHighlightModule,
+ NgOptionHighlightDirective,
OpenprojectPrincipalRenderingModule,
OpenprojectContentLoaderModule,
@@ -139,7 +139,7 @@ export function bootstrapModule(injector:Injector):void {
IconModule,
AttributeHelpTextModule,
FormsModule,
- NgOptionHighlightModule,
+ NgOptionHighlightDirective,
OpenprojectPrincipalRenderingModule,
OpenprojectAutocompleterModule,
OpenprojectContentLoaderModule,