Merge pull request #1615 from atmire/w2p-90918_Upgrade-ng-dynamic-forms-and-rxjs

Upgrade ng-dynamic-forms to v15 and RxJs to v7

package.json

@@ -68,8 +68,8 @@
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
-    "@ng-dynamic-forms/core": "^14.0.1",
+    "@ng-dynamic-forms/core": "^15.0.0",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "^14.0.1",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "^15.0.0",
     "@ngrx/effects": "^13.0.2",
     "@ngrx/router-store": "^13.0.2",
     "@ngrx/store": "^13.0.2",
@@ -77,7 +77,7 @@
     "@ngx-translate/core": "^13.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^9.0.0",
     "angular-idle-preload": "3.0.0",
-    "angulartics2": "^10.0.0",
+    "angulartics2": "^12.0.0",
     "bootstrap": "4.3.1",
     "caniuse-lite": "^1.0.30001165",
     "cerialize": "0.1.18",
@@ -119,7 +119,7 @@
     "prop-types": "^15.7.2",
     "react-copy-to-clipboard": "^5.0.1",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.6.3",
+    "rxjs": "^7.5.5",
     "sortablejs": "1.13.0",
     "tslib": "^2.0.0",
     "url-parse": "^1.5.6",
@@ -161,7 +161,7 @@
     "css-minimizer-webpack-plugin": "^3.4.1",
     "cssnano": "^5.0.6",
     "cypress": "9.5.1",
-    "cypress-axe": "^0.13.0",
+    "cypress-axe": "^0.14.0",
     "debug-loader": "^0.0.1",
     "deep-freeze": "0.0.1",
     "dotenv": "^8.2.0",
@@ -173,7 +173,7 @@
     "fork-ts-checker-webpack-plugin": "^6.0.3",
     "html-loader": "^1.3.2",
     "jasmine-core": "^3.8.0",
-    "jasmine-marbles": "0.6.0",
+    "jasmine-marbles": "0.9.2",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "^6.3.14",
     "karma-chrome-launcher": "~3.1.0",
@@ -181,7 +181,7 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ngx-mask": "^12.0.0",
+    "ngx-mask": "^13.1.7",
     "nodemon": "^2.0.15",
     "postcss": "^8.1",
     "postcss-apply": "0.12.0",
@@ -195,7 +195,7 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
-    "rxjs-spy": "^7.5.3",
+    "rxjs-spy": "^8.0.2",
     "sass": "~1.32.6",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.1.1",
@@ -209,4 +209,4 @@
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^4.5.0"
   }
-}
+}

src/app/app.component.spec.ts

@@ -4,7 +4,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule, DOCUMENT } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 // Load the implementations that should be tested
 import { AppComponent } from './app.component';

src/app/app.component.ts

@@ -23,7 +23,7 @@ import { BehaviorSubject, Observable, of } from 'rxjs';
 import { select, Store } from '@ngrx/store';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 import { MetadataService } from './core/metadata/metadata.service';
 import { HostWindowResizeAction } from './shared/host-window.actions';

src/app/core/pagination/pagination.service.ts

@@ -7,8 +7,8 @@ import { filter, map, take } from 'rxjs/operators';
 import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { difference } from '../../shared/object.util';
-import { isNumeric } from 'rxjs/internal-compatibility';
 import { FindListOptions } from '../data/find-list-options.model';
+import { isNumeric } from '../../shared/numeric.util';
 
 @Injectable({
   providedIn: 'root',

src/app/core/shared/hal-endpoint.service.spec.ts

@@ -3,7 +3,7 @@ import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from './hal-endpoint.service';
 import { EndpointMapRequest } from '../data/request.models';
-import { combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -162,9 +162,9 @@ describe('HALEndpointService', () => {
         return observableOf(endpointMaps[param]);
       });
 
-      observableCombineLatest([
+      observableCombineLatest<string[]>([
         (service as any).getEndpointAt(start, 'one'),
-        (service as any).getEndpointAt(start, 'one', 'two')
+        (service as any).getEndpointAt(start, 'one', 'two'),
       ]).subscribe(([endpoint1, endpoint2]) => {
         expect(endpoint1).toEqual(one);
         expect(endpoint2).toEqual(two);

src/app/core/shared/operators.ts

@@ -1,5 +1,5 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, interval } from 'rxjs';
-import { debounceTime, filter, find, map, switchMap, take, takeWhile } from 'rxjs/operators';
+import { filter, find, map, switchMap, take, takeWhile, debounce, debounceTime } from 'rxjs/operators';
 import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/models/search-result.model';
 import { PaginatedList } from '../data/paginated-list.model';
@@ -9,6 +9,17 @@ import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
 import { InjectionToken } from '@angular/core';
+import { MonoTypeOperatorFunction, SchedulerLike } from 'rxjs/internal/types';
+
+/**
+ * Use this method instead of the RxJs debounceTime if you're waiting for debouncing in tests;
+ * debounceTime doesn't work with fakeAsync/tick anymore as of Angular 13.2.6 & RxJs 7.5.5
+ * Workaround suggested in https://github.com/angular/angular/issues/44351#issuecomment-1107454054
+ * todo: remove once the above issue is fixed
+ */
+export const debounceTimeWorkaround = <T>(dueTime: number, scheduler?: SchedulerLike): MonoTypeOperatorFunction<T> => {
+  return debounce(() => interval(dueTime, scheduler));
+};
 
 export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) => (source: Observable<T>) => Observable<T>>('debounceTime', {
   providedIn: 'root',

src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts

@@ -5,8 +5,9 @@ import { FormGroup } from '@angular/forms';
 import { hasValue, isEmpty } from '../../shared/empty.util';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { debounceTime, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
+import { debounceTimeWorkaround as debounceTime } from '../../core/shared/operators';
 
 @Component({
   selector: 'ds-profile-page-security-form',

src/app/root/root.component.spec.ts

@@ -9,7 +9,7 @@ import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
 import { MetadataService } from '../core/metadata/metadata.service';
 import { MetadataServiceMock } from '../shared/mocks/metadata-service.mock';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 import { AngularticsProviderMock } from '../shared/mocks/angulartics-provider.service.mock';
 import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
 import { AuthService } from '../core/auth/auth.service';

src/app/root/root.component.ts

@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
 import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 import { MetadataService } from '../core/metadata/metadata.service';
 import { HostWindowState } from '../shared/search/host-window.reducer';

src/app/shared/dso-selector/dso-selector/dso-selector.component.ts

@@ -143,7 +143,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
     this.typesString = this.types.map((type: string) => type.toString().toLowerCase()).join(', ');
 
     // Create an observable searching for the current DSO (return empty list if there's no current DSO)
-    let currentDSOResult$;
+    let currentDSOResult$: Observable<PaginatedList<SearchResult<DSpaceObject>>>;
     if (isNotEmpty(this.currentDSOId)) {
       currentDSOResult$ = this.search(this.getCurrentDSOQuery(), 1).pipe(getFirstSucceededRemoteDataPayload());
     } else {

src/app/shared/item/item-versions/item-versions.component.spec.ts

@@ -100,7 +100,9 @@ describe('ItemVersionsComponent', () => {
     isAuthenticated: observableOf(true),
     setRedirectUrl: {}
   });
-  const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+  const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', {
+    isAuthorized: observableOf(true)
+  });
   const workspaceItemDataServiceSpy = jasmine.createSpyObj('workspaceItemDataService', {
     findByItem: EMPTY,
   });

src/app/shared/numeric.util.spec.ts

@@ -0,0 +1,53 @@
+import { isNumeric } from './numeric.util';
+
+describe('Numeric Utils', () => {
+  describe('isNumeric', () => {
+    it('should return true for Number values', () => {
+      expect(isNumeric(0)).toBeTrue();
+      expect(isNumeric(123456)).toBeTrue();
+      expect(isNumeric(-123456)).toBeTrue();
+      expect(isNumeric(0.1234)).toBeTrue();
+      expect(isNumeric(-0.1234)).toBeTrue();
+      expect(isNumeric(1234e56)).toBeTrue();
+      expect(isNumeric(-1234e-56)).toBeTrue();
+      expect(isNumeric(0x123456)).toBeTrue();
+      expect(isNumeric(-0x123456)).toBeTrue();
+    });
+
+    it('should return true for numeric String values', () => {
+      expect(isNumeric('0')).toBeTrue();
+      expect(isNumeric('123456')).toBeTrue();
+      expect(isNumeric('-123456')).toBeTrue();
+      expect(isNumeric('0.1234')).toBeTrue();
+      expect(isNumeric('-0.1234')).toBeTrue();
+      expect(isNumeric('1234e56')).toBeTrue();
+      expect(isNumeric('-1234e-56')).toBeTrue();
+      expect(isNumeric('0x123456')).toBeTrue();
+
+      // expect(isNumeric('-0x123456')).toBeTrue();  // not recognized as numeric, known issue
+    });
+
+    it('should return false for non-numeric String values', () => {
+      expect(isNumeric('just a regular string')).toBeFalse();
+      expect(isNumeric('')).toBeFalse();
+      expect(isNumeric(' ')).toBeFalse();
+      expect(isNumeric('\n')).toBeFalse();
+      expect(isNumeric('\t')).toBeFalse();
+      expect(isNumeric('null')).toBeFalse();
+      expect(isNumeric('undefined')).toBeFalse();
+    });
+
+    it('should return false for any other kind of value', () => {
+      expect(isNumeric([1,2,3])).toBeFalse();
+      expect(isNumeric({ a:1, b:2, c:3 })).toBeFalse();
+      expect(isNumeric(() => { /* empty */ })).toBeFalse();
+      expect(isNumeric(null)).toBeFalse();
+      expect(isNumeric(undefined)).toBeFalse();
+      expect(isNumeric(true)).toBeFalse();
+      expect(isNumeric(false)).toBeFalse();
+      expect(isNumeric(NaN)).toBeFalse();
+      expect(isNumeric(Infinity)).toBeFalse();
+      expect(isNumeric(-Infinity)).toBeFalse();
+    });
+  });
+});

src/app/shared/numeric.util.ts

@@ -0,0 +1,16 @@
+/**
+ * Whether a value is a Number or numeric string.
+ *
+ * Taken from RxJs 6.x (licensed under Apache 2.0)
+ * This function was removed from RxJs 7.x onwards.
+ *
+ * @param val: any value
+ * @returns whether this value is numeric
+ */
+export function isNumeric(val: any): val is number | string {
+  // parseFloat NaNs numeric-cast false positives (null|true|false|"")
+  // ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+  // subtraction forces infinities to NaN
+  // adding 1 corrects loss of precision from parseFloat (#15100)
+  return !Array.isArray(val) && (val - parseFloat(val) + 1) >= 0;
+}

src/app/shared/remote-data.utils.ts

@@ -61,7 +61,7 @@ export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCod
  * @param timeCompleted the moment when the remoteData was completed
  */
 export function createFailedRemoteDataObject$<T>(errorMessage?: string, statusCode?: number, timeCompleted?: number): Observable<RemoteData<T>> {
-  return observableOf(createFailedRemoteDataObject(errorMessage, statusCode, timeCompleted));
+  return observableOf(createFailedRemoteDataObject<T>(errorMessage, statusCode, timeCompleted));
 }
 
 /**
@@ -85,7 +85,7 @@ export function createPendingRemoteDataObject<T>(lastVerified = FIXED_TIMESTAMP)
  * @param lastVerified the moment when the remoteData was last verified
  */
 export function createPendingRemoteDataObject$<T>(lastVerified?: number): Observable<RemoteData<T>> {
-  return observableOf(createPendingRemoteDataObject(lastVerified));
+  return observableOf(createPendingRemoteDataObject<T>(lastVerified));
 }
 
 /**

src/app/shared/search/search-filters/search-filters.component.spec.ts

@@ -80,7 +80,7 @@ describe('SearchFiltersComponent', () => {
 
       expect(comp.initFilters).toHaveBeenCalledTimes(1);
 
-      refreshFiltersEmitter.next();
+      refreshFiltersEmitter.next(null);
 
       expect(comp.initFilters).toHaveBeenCalledTimes(2);
     });

src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts

@@ -38,7 +38,7 @@ export class VocabularyTreeFlatDataSource<T, F> extends DataSource<F> {
       this._treeControl.expansionModel.changed,
       this._flattenedData
     ];
-    return merge(...changes).pipe(map(() => {
+    return merge<any>(...changes).pipe(map((): F[] => {
       this._expandedData.next(
         this._treeFlattener.expandFlattenedNodes(this._flattenedData.value, this._treeControl));
       return this._expandedData.value;

src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts

@@ -2,7 +2,7 @@ import { TestBed, waitForAsync } from '@angular/core/testing';
 
 import { TestScheduler } from 'rxjs/testing';
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { getTestScheduler, hot } from 'jasmine-marbles';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 
 import { VocabularyTreeviewService } from './vocabulary-treeview.service';
 import { VocabularyService } from '../../core/submission/vocabularies/vocabulary.service';
@@ -14,6 +14,8 @@ import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models
 import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { expand, map, switchMap } from 'rxjs/operators';
+import { from as observableFrom } from 'rxjs';
 
 describe('VocabularyTreeviewService test suite', () => {
 
@@ -320,10 +322,25 @@ describe('VocabularyTreeviewService test suite', () => {
       scheduler.schedule(() => service.searchByQuery(vocabularyOptions));
       scheduler.flush();
 
-      searchChildNode.childrenChange.next([searchChildNode3]);
+      // We can't check the tree by comparing root TreeviewNodes directly in this particular test;
-      searchItemNode.childrenChange.next([searchChildNode]);
+      // Since RxJs 7, BehaviorSubjects can no longer be reliably compared because of the new currentObservers property
-      expect(serviceAsAny.dataChange.value.length).toEqual(1);
+      // (see https://github.com/ReactiveX/rxjs/pull/6842)
-      expect(serviceAsAny.dataChange.value).toEqual([searchItemNode]);
+      const levels$ = serviceAsAny.dataChange.pipe(
+        expand((nodes: TreeviewNode[]) => {         // recursively apply:
+          return observableFrom(nodes).pipe(        //   for each node in the array...
+            switchMap(node => node.childrenChange)  //   ...map it to the array its child nodes.
+          );                                        // because we only have one child per node in this case,
+        }),                                         // this results in an array of nodes for each level of the tree.
+        map((nodes: TreeviewNode[]) => nodes.map(node => node.item)), // finally, replace nodes with their vocab entries
+      );
+
+      // Confirm that this corresponds to the hierarchy we set up above
+      expect(levels$).toBeObservable(cold('-(abcd)', {
+        a: [item],
+        b: [child],
+        c: [child3],
+        d: []           // ensure that grandchild has no children & the recursion stopped there
+      }));
     });
   });
 

src/app/statistics/google-analytics.service.spec.ts

@@ -1,5 +1,5 @@
 import { GoogleAnalyticsService } from './google-analytics.service';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import {
   createFailedRemoteDataObject$,

src/app/statistics/google-analytics.service.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { isEmpty } from '../shared/empty.util';

src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts

@@ -64,14 +64,24 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
       compAsAny = null;
     });
 
-    it('The variable \'selectedEvent\' should be assigned', () => {
+    it('should emit from selectedEvent on selectObject', () => {
-      const event = new EventEmitter<CollectionListEntry>();
+      spyOn(comp.selectedEvent, 'emit').and.callThrough();
-      comp.selectObject(event);
 
-      expect(comp.selectedEvent).toEqual(event);
+      const entry = {
+        communities: [
+          { id: 'community1' },
+          { id: 'community2' }
+        ],
+        collection: {
+          id: 'collection'
+        }
+      } as CollectionListEntry;
+      comp.selectObject(entry);
+
+      expect(comp.selectedEvent.emit).toHaveBeenCalledWith(entry);
     });
 
-    it('The variable \'selectedEvent\' should be assigned', () => {
+    it('should dismiss modal on closeCollectionModal', () => {
       spyOn(compAsAny.activeModal, 'dismiss');
       comp.closeCollectionModal();
 

src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts

@@ -35,10 +35,10 @@ export class SubmissionImportExternalCollectionComponent {
   ) { }
 
   /**
-   * This method populates the 'selectedEvent' variable.
+   * This method emits the selected Collection from the 'selectedEvent' variable.
    */
-  public selectObject(event): void {
+  public selectObject(object: CollectionListEntry): void {
-    this.selectedEvent.emit(event);
+    this.selectedEvent.emit(object);
   }
 
   /**

src/modules/app/browser-app.module.ts

@@ -18,7 +18,7 @@ import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.ser
 import { ClientCookieService } from '../../app/core/services/client-cookie.service';
 import { CookieService } from '../../app/core/services/cookie.service';
 import { AuthService } from '../../app/core/auth/auth.service';
-import { Angulartics2RouterlessModule } from 'angulartics2/routerlessmodule';
+import { Angulartics2RouterlessModule } from 'angulartics2';
 import { SubmissionService } from '../../app/submission/submission.service';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
 import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';

src/modules/app/server-app.module.ts

@@ -8,7 +8,7 @@ import { RouterModule } from '@angular/router';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { Angulartics2 } from 'angulartics2';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+import { Angulartics2GoogleAnalytics } from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';
 

yarn.lock

@@ -1670,17 +1670,17 @@
   dependencies:
     tslib "^2.3.0"
 
-"@ng-dynamic-forms/core@^14.0.1":
+"@ng-dynamic-forms/core@^15.0.0":
-  version "14.0.1"
+  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-14.0.1.tgz#e5815a7f67b4e23a5c726afd137b3e27afe09ab9"
+  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-15.0.0.tgz#674a88c253aa100b30144bf7ebf518e24b72f553"
-  integrity sha512-Pys4H0lSk2Ae8y80mRD4yZMTu+80DIOmf4B2L9fK2q/zYyxVSexu0DynDR8XApArXYU78EPsWnEwgNSWwX6RKw==
+  integrity sha512-JJ0w8WdOA+wsHyt/hwitGhv/e1j95/TlRS82vvZetP/Ip3kjvD/Ge8jbg4bEssIAXZjfBqS/Gy00Hxo4h57DgQ==
   dependencies:
     tslib "^2.0.0"
 
-"@ng-dynamic-forms/ui-ng-bootstrap@^14.0.1":
+"@ng-dynamic-forms/ui-ng-bootstrap@^15.0.0":
-  version "14.0.1"
+  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-14.0.1.tgz#10f271b85eceadad02f616f752cf9806eb085106"
+  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-15.0.0.tgz#0ab5614bc2efccc4cddbb384865b66d4740bcd3d"
-  integrity sha512-Xf56kZBwM0vsRgEKcZvh8SsypCWcVTKeyq9id68+jQzH9/bQ+qriLBF35zDHrS9vJWmSufa5xqqRx/ycxhfpLw==
+  integrity sha512-b/+tOJxtDRMzoFA7KLA8JRxbAnXd8d8072/P6C+2xOMaG0Ttc1UUiNQOZ5w82y78nr0bZ63oFHSR0xzSVtMXnA==
   dependencies:
     tslib "^2.0.0"
 
@@ -2920,12 +2920,12 @@ angular-idle-preload@3.0.0:
   resolved "https://registry.yarnpkg.com/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz#decace34d9fac1cb00000727a6dc5caafdb84e4d"
   integrity sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA==
 
-angulartics2@^10.0.0:
+angulartics2@^12.0.0:
-  version "10.1.0"
+  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-10.1.0.tgz#2988f95f25cf6a8dd630d63ea604eb6643e076c3"
+  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.0.0.tgz#d9440ff98d133ae02d97b991a32a711a5b88559f"
-  integrity sha512-MnwQxRXJkfbBF7417Cs7L/SIuTRNWHCOBnGolZXHFz5ogw1e51KdCKUaUkfgBogR7JpXP279FU9UDkzerIS3xw==
+  integrity sha512-hNjvOp/IvKD00Ix3zRGfGJUwwOhSM5RFhvM/iSBH7dvJKavCBWbI464PWshjXfRBbruangPUbJGhSLnoENNtmg==
   dependencies:
-    tslib "^2.0.0"
+    tslib "^2.3.0"
 
 ansi-align@^3.0.0:
   version "3.0.1"
@@ -4613,10 +4613,10 @@ custom-event@~1.0.0:
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
   integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
-cypress-axe@^0.13.0:
+cypress-axe@^0.14.0:
-  version "0.13.0"
+  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.13.0.tgz#3234e1a79a27701f2451fcf2f333eb74204c7966"
+  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.14.0.tgz#5f5e70fb36b8cb3ba73a8ba01e9262ff1268d5e2"
-  integrity sha512-fCIy7RiDCm7t30U3C99gGwQrUO307EYE1QqXNaf9ToK4DVqW8y5on+0a/kUHMrHdlls2rENF6TN9ZPpPpwLrnw==
+  integrity sha512-7Rdjnko0MjggCmndc1wECAkvQBIhuy+DRtjF7bd5YPZRFvubfMNvrxfqD8PWQmxm7MZE0ffS4Xr43V6ZmvLopg==
 
 cypress@9.5.1:
   version "9.5.1"
@@ -7536,12 +7536,12 @@ jasmine-core@~2.8.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine-marbles@0.6.0:
+jasmine-marbles@0.9.2:
-  version "0.6.0"
+  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.6.0.tgz#f78dc1a3bc452976de10ee8b47c73d616532a954"
+  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.9.2.tgz#5adfee5f72c7f24270687fa64a6e8a8613ffa841"
-  integrity sha512-1uzgjEesEeCb+r+v46qn5x326TiGqk5SUZa+A3O+XnMCjG/pGcUOhL9Xsg5L7gLC6RFHyWGTkB5fei4rcvIOiQ==
+  integrity sha512-T7RjG4fRsdiGGzbQZ6Kj39qYt6O1/KIcR4FkUNsD3DUGkd/AzpwzN+xtk0DXlLWEz5BaVdK1SzMgQDVw879c4Q==
   dependencies:
-    lodash "^4.5.0"
+    lodash "^4.17.20"
 
 jasmine-spec-reporter@~5.0.0:
   version "5.0.2"
@@ -8211,7 +8211,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.5.0, lodash@^4.7.0:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8853,12 +8853,12 @@ ngx-infinite-scroll@^10.0.1:
     "@scarf/scarf" "^1.1.0"
     opencollective-postinstall "^2.0.2"
 
-ngx-mask@^12.0.0:
+ngx-mask@^13.1.7:
-  version "12.0.0"
+  version "13.1.7"
-  resolved "https://registry.yarnpkg.com/ngx-mask/-/ngx-mask-12.0.0.tgz#8eb363cc609ab71b687bbe6f87497c461ca120b1"
+  resolved "https://registry.yarnpkg.com/ngx-mask/-/ngx-mask-13.1.7.tgz#9ef40354a83484aaf77aff74742cd0f43b4a65cd"
-  integrity sha512-q4vUjhjJfg4faRud/tUdCTOs3JA6B+rBB2OPZ2xBZy4LNTRKGfUK683LrDCitMVBezjEAVrkQdUT1I4C7LXBZQ==
+  integrity sha512-zwGSEGt+WRlb31qMd92K25MCNUhfI2XKOMv+m5NypkZ+stONdBxAXjp8wA/1MJ46uYF5UYLmKPdkXloZBtOXQQ==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.3.0"
 
 ngx-moment@^5.0.0:
   version "5.0.0"
@@ -11125,10 +11125,10 @@ rxjs-report-usage@^1.0.4:
     glob "~7.2.0"
     prompts "~2.4.2"
 
-rxjs-spy@^7.5.3:
+rxjs-spy@^8.0.2:
-  version "7.5.3"
+  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-7.5.3.tgz#0194bc23ed0c30fb6a61f8bccbc8090e545b91b9"
+  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-8.0.2.tgz#dd510bdb58d798e0bc23121ab67714dd6fd95f88"
-  integrity sha512-8QsSL6Ma51dTeaJ5Q9zWqhqnCSEkDf56Evs1gUsI9N22oB7bYrPMMx4UnoifNGc+Pko2sGX/xydzinLwGO+2pw==
+  integrity sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==
   dependencies:
     "@types/circular-json" "^0.4.0"
     "@types/stacktrace-js" "^0.0.33"
@@ -11137,7 +11137,7 @@ rxjs-spy@^7.5.3:
     rxjs-report-usage "^1.0.4"
     stacktrace-gps "^3.0.2"
 
-rxjs@6.6.7, rxjs@^6.5.4, rxjs@^6.5.5, rxjs@^6.6.3, rxjs@~6.6.0:
+rxjs@6.6.7, rxjs@^6.5.4, rxjs@^6.5.5, rxjs@~6.6.0:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -11158,6 +11158,13 @@ rxjs@^7.2.0, rxjs@^7.5.1:
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^7.5.5:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
+  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"