diff --git a/package.json b/package.json index 2d71a3a7bb..659a286c44 100644 --- a/package.json +++ b/package.json @@ -116,11 +116,10 @@ "mirador-share-plugin": "^0.11.0", "morgan": "^1.10.0", "ng-mocks": "^14.10.0", - "ng2-file-upload": "1.4.0", + "ng2-file-upload": "5.0.0", "ng2-nouislider": "^2.0.0", "ngx-infinite-scroll": "^15.0.0", "ngx-pagination": "6.0.3", - "ngx-sortablejs": "^11.1.0", "ngx-ui-switch": "^14.1.0", "nouislider": "^15.7.1", "pem": "1.14.7", diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html index a6b90b23aa..0b8835877d 100644 --- a/src/app/shared/form/chips/chips.component.html +++ b/src/app/shared/form/chips/chips.component.html @@ -1,5 +1,5 @@
-
+

diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts index 032e3b278d..4fb84b7d70 100644 --- a/src/app/shared/form/chips/chips.component.spec.ts +++ b/src/app/shared/form/chips/chips.component.spec.ts @@ -11,7 +11,6 @@ import { createTestComponent } from '../../testing/utils.test'; import { AuthorityConfidenceStateDirective } from '../directives/authority-confidence-state.directive'; import { TranslateModule } from '@ngx-translate/core'; import { ConfidenceType } from '../../../core/shared/confidence-type'; -import { SortablejsModule } from 'ngx-sortablejs'; import { environment } from '../../../../environments/environment'; describe('ChipsComponent test suite', () => { @@ -29,7 +28,6 @@ describe('ChipsComponent test suite', () => { TestBed.configureTestingModule({ imports: [ NgbModule, - SortablejsModule.forRoot({ animation: 150 }), TranslateModule.forRoot(), ChipsComponent, TestComponent, diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts index 1230876bea..56234e3e8b 100644 --- a/src/app/shared/form/chips/chips.component.ts +++ b/src/app/shared/form/chips/chips.component.ts @@ -7,10 +7,8 @@ import { Chips } from './models/chips.model'; import { ChipsItem } from './models/chips-item.model'; import { DragService } from '../../../core/drag.service'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { Options } from 'sortablejs'; import { BehaviorSubject } from 'rxjs'; import { AsyncPipe, NgClass, NgForOf, NgIf } from '@angular/common'; -import { SortablejsModule } from 'ngx-sortablejs'; import { AuthorityConfidenceStateDirective } from '../directives/authority-confidence-state.directive'; @Component({ @@ -21,7 +19,6 @@ import { AuthorityConfidenceStateDirective } from '../directives/authority-confi NgbTooltipModule, NgClass, NgForOf, - SortablejsModule, AsyncPipe, AuthorityConfidenceStateDirective, NgIf, @@ -41,7 +38,6 @@ export class ChipsComponent implements OnChanges { @Output() change: EventEmitter = new EventEmitter(); isDragging: BehaviorSubject = new BehaviorSubject(false); - options: Options; dragged = -1; tipText: string[]; @@ -50,13 +46,6 @@ export class ChipsComponent implements OnChanges { private dragService: DragService, private translate: TranslateService) { - this.options = { - animation: 300, - chosenClass: 'm-0', - dragClass: 'm-0', - filter: '.chips-sort-ignore', - ghostClass: 'm-0' - }; } ngOnChanges(changes: SimpleChanges) { diff --git a/src/app/shared/form/form.module.ts b/src/app/shared/form/form.module.ts index 808cf38087..0bc87bef90 100644 --- a/src/app/shared/form/form.module.ts +++ b/src/app/shared/form/form.module.ts @@ -61,7 +61,6 @@ import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstr import { ChipsComponent } from './chips/chips.component'; import { NumberPickerComponent } from './number-picker/number-picker.component'; import { AuthorityConfidenceStateDirective } from './directives/authority-confidence-state.directive'; -import { SortablejsModule } from 'ngx-sortablejs'; import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component'; import { VocabularyTreeviewModalComponent } from './vocabulary-treeview-modal/vocabulary-treeview-modal.component'; import { FormBuilderService } from './builder/form-builder.service'; @@ -124,7 +123,6 @@ const DIRECTIVES = [ DynamicFormsNGBootstrapUIModule, SearchModule, TranslateModule, - SortablejsModule, NgxMaskModule.forRoot(), NgbDatepickerModule, NgbTimepickerModule, diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index fff06e9ebe..76127291d2 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -7,8 +7,6 @@ import { REQUEST } from '@nguniversal/express-engine/tokens'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader'; -import { IdlePreloadModule } from 'angular-idle-preload'; - import { AppComponent } from '../../app/app.component'; import { AppModule } from '../../app/app.module'; @@ -55,7 +53,6 @@ export function getRequest(transferState: TransferState): any { imports: [ HttpClientModule, // forRoot ensures the providers are only created once - IdlePreloadModule.forRoot(), StatisticsModule.forRoot(), Angulartics2RouterlessModule.forRoot(), BrowserAnimationsModule, diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 78cfb5dbb7..7ef5281b22 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -6,7 +6,6 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module'; import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; -import { IdlePreloadModule } from 'angular-idle-preload'; import { MenuModule } from '../../app/shared/menu/menu.module'; import { NavbarModule } from '../../app/navbar/navbar.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -271,7 +270,6 @@ const DECLARATIONS = [ ItemVersionsModule, FormsModule, HttpClientModule, - IdlePreloadModule, InfoModule, MenuModule, DsoPageModule, diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index 57a1104897..f4571bf445 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -6,7 +6,6 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module'; import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; -import { IdlePreloadModule } from 'angular-idle-preload'; import { MenuModule } from '../../app/shared/menu/menu.module'; import { NavbarModule } from '../../app/navbar/navbar.module'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @@ -53,7 +52,6 @@ const DECLARATIONS = [ ItemVersionsModule, FormsModule, HttpClientModule, - IdlePreloadModule, InfoModule, MenuModule, NavbarModule, diff --git a/yarn.lock b/yarn.lock index 7063a823c7..bb65d1b527 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8923,12 +8923,12 @@ ng-mocks@^14.10.0: resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-14.10.0.tgz#36064650c52f6e01be5c810228a0c9585109bb27" integrity sha512-gUnrSH4ejlkSpd9wgEe7PNKEyADJCriemSIbyebS0SQjyotSZfp/8jBuMl7Euvk0sPanV2IGhOv6W9e6hNRe/A== -ng2-file-upload@1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-1.4.0.tgz" - integrity sha512-3J/KPU/tyh/ad6TFeUbrxX+SihUj0iOEt2Zsg4EX7mB3GFiQscXOfcUOxCkBtPWWWaqt3azrYbVGzsYa3/7NzQ== +ng2-file-upload@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-5.0.0.tgz#8d52062bca192e4fb2774c230c4fb051ae176403" + integrity sha512-M2JaX0unB/30GmQUScfXko2vseaPlU1R5jnhL5cfvOLNw8BBSVJAdOSmcavJzicgTZWCYz7y7Fvpr939bd4eCA== dependencies: - tslib "^1.9.0" + tslib "^2.3.0" ng2-nouislider@^2.0.0: version "2.0.0" @@ -8958,13 +8958,6 @@ ngx-pagination@6.0.3: dependencies: tslib "^2.3.0" -ngx-sortablejs@^11.1.0: - version "11.1.0" - resolved "https://registry.npmjs.org/ngx-sortablejs/-/ngx-sortablejs-11.1.0.tgz" - integrity sha512-eM4dHwWSmXDcvF5gUmyMMQ0qqcqBXWCSZ9IRpqx4UkBKfo4N7pk/QuYh5io2fXVHWVFDaxW1yhn2FNpqxV6Jqw== - dependencies: - tslib "^2.0.0" - ngx-ui-switch@^14.1.0: version "14.1.0" resolved "https://registry.yarnpkg.com/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz#32248361a684257c5ae64cfde61b95de920b901c"