New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: mgr/dashboard: Remove fieldsets when using CdTable #24478

Merged
merged 2 commits into from Oct 29, 2018

Conversation

Projects
None yet
7 participants
@tspmelo
Copy link
Contributor

tspmelo commented Oct 8, 2018

tspmelo added some commits Aug 23, 2018

mgr/dashboard: Fix growing table in firefox
It seems Firefox 52 has some kind of problem when
rendering our table inside a fieldset.

Since we don't really require the fieldset in the monitor page,
I have removed it to "fix" this problem.

Fixes: http://tracker.ceph.com/issues/26999

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 09a2705)
mgr/dashboard: Remove fieldsets when using CdTable
Fixes: https://tracker.ceph.com/issues/26999

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit a33949b)

Conflicts:
  (all paths are relative to src/pybind/mgr/dashboard/frontend/src/app/ceph/)
  performance-counter/performance-counter/performance-counter.component.html
    Kept the breadcrumb section
  cephfs/cephfs-detail/cephfs-detail.component.html
    File doesn't exist in mimic,
    changes were applied to cephfs/cephfs/cephfs.component.html
  cephfs/clients/clients.component.html
    File was modified in a unrelated PR, but changes needed to be included

@tspmelo tspmelo added this to the mimic milestone Oct 8, 2018

@tspmelo tspmelo requested a review from smithfarm Oct 8, 2018

@smithfarm smithfarm removed the backport label Oct 8, 2018

@smithfarm smithfarm requested a review from LenzGr Oct 8, 2018

@tspmelo tspmelo added the DNM label Oct 9, 2018

@ricardoasmarques ricardoasmarques added backport and removed backport labels Oct 9, 2018

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Oct 10, 2018

Reason for DNM: @smithfarm I was told that #24183 might be backported to mimic.
If that is the case, this PR would already be included and merging it would created conflicts.

The same applies to #24478.

@epuertat

This comment has been minimized.

Copy link
Contributor

epuertat commented Oct 10, 2018

@smithfarm #24183 would be hard to backport to Mimic as it currently is: it includes changes to work around Mimic-master features missing in Luminous (centralized config, new RBD feature flags, CephMgr refactor, etc).

As that 4th backporting chunk exceeded the features present in Mimic, the agreement with @LenzGr , @jcsp, @liewegas, etc., was no to backport it to Luminous, and just leave it open for the case some 'luminous-dashboard' branch was ever created (or someone else wants to patch their sources to bring dashboard_v2 to Luminous).

However, this other PR #24026 is fully suitable for being merged to Luminous (encompasses commits from #23271 and #23804 as well), as it respects 'feature' parity with Mimic (13.2.0 release, all later bugfixes are missing there though).

@smithfarm

This comment has been minimized.

Copy link
Contributor

smithfarm commented Oct 10, 2018

@epuertat I was just noting @tspmelo 's comment explaining why DNM was added. As far as I'm concerned, any backport PR is fine to go in once the relevant dev lead ( @LenzGr in this case ) approves and it passes integration testing.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 15, 2018

@tspmelo pls add needs-qa when DNM removed

@tspmelo tspmelo removed the DNM label Oct 18, 2018

@LenzGr LenzGr added the needs-review label Oct 18, 2018

@LenzGr LenzGr requested review from Devp00l and ricardoasmarques Oct 18, 2018

@LenzGr

LenzGr approved these changes Oct 19, 2018

Copy link
Contributor

LenzGr left a comment

LGTM

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 23, 2018

@Devp00l
Copy link
Contributor

Devp00l left a comment

LGTM

@yuriw yuriw merged commit 60793af into ceph:mimic Oct 29, 2018

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@tspmelo tspmelo deleted the tspmelo:wip-27851-mimic branch Oct 29, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment