From: Lenz Grimmer <lenz@grimmer.com>
Date: Wed, 7 Nov 2018 10:55:14 +0000 (+0100)
Subject: Merge pull request #24681 from tspmelo/wip-npm-update
X-Git-Tag: v14.1.0~989
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d98c49daeb3f6840f20e457ec2a89474edd133bd;p=ceph.git

Merge pull request #24681 from tspmelo/wip-npm-update

mgr/dashboard: Update npm packages

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
---

d98c49daeb3f6840f20e457ec2a89474edd133bd
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts
index 497a8b27ee72,dd8ec94d14e2..02a17796dd68
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts
@@@ -125,25 -125,33 +125,23 @@@ describe('OsdListComponent', () => 
    });
  
    describe('test table actions in submenu', () => {
-     beforeEach(
-       fakeAsync(() => {
-         // The menu needs a click to render the dropdown!
-         const dropDownToggle = fixture.debugElement.query(By.css('.dropdown-toggle'));
-         dropDownToggle.triggerEventHandler('click', null);
-         tick();
-         fixture.detectChanges();
-       })
-     );
+     beforeEach(fakeAsync(() => {
+       // The menu needs a click to render the dropdown!
+       const dropDownToggle = fixture.debugElement.query(By.css('.dropdown-toggle'));
+       dropDownToggle.triggerEventHandler('click', null);
+       tick();
+       fixture.detectChanges();
+     }));
  
 -    /**
 -     * Helper function to retrieve menu item
 -     * @param selector
 -     */
 -    const getMenuItem = (selector: string): DebugElement => {
 -      return fixture.debugElement
 -        .query(By.directive(TableActionsComponent))
 -        .query(By.css(selector));
 -    };
 +    it('has all menu entries disabled', () => {
 +      const tableActionElement = fixture.debugElement.query(By.directive(TableActionsComponent));
 +      const toClassName = TestBed.get(TableActionsComponent).toClassName;
 +      const getActionClasses = (action: CdTableAction) =>
 +        tableActionElement.query(By.css('.' + toClassName(action.name))).classes;
  
 -    it('has menu entries disabled for entries without create permission', () => {
 -      component.tableActions
 -        .filter((tableAction) => tableAction.permission !== 'create')
 -        .map((tableAction) => tableAction.name)
 -        .map(TestBed.get(TableActionsComponent).toClassName)
 -        .map((className) => getMenuItem(`.${className}`))
 -        .forEach((debugElement) => {
 -          expect(debugElement.classes.disabled).toBe(true);
 -        });
 +      component.tableActions.forEach((action) => {
 +        expect(getActionClasses(action).disabled).toBe(true);
 +      });
      });
    });