Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) #242

Merged
merged 4 commits into from Apr 18, 2017
Merged

Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) #242

merged 4 commits into from Apr 18, 2017

Conversation

yrudman
Copy link
Contributor

@yrudman yrudman commented Jan 25, 2017 •
edited

There is a request to provide combined view of jobs and tasks: https://www.pivotaltracker.com/story/show/125186471

This PR depends on ManageIQ/manageiq#13452, which implements changes on Job and MiqTask models, changes to product/views/MiqTask.yamls and data migrations.

In this PR:

  • merging Jobs specific and Tasks specific layouts: instead of four tabs there would be two - My Tasks and All Tasks with access based on :feature => "miq_task_my_ui" and :feature => "miq_task_all_ui" respectively.
    • Both tabs using the same report to provide view -MiqTask.yaml.
    • Dropdown filter (to filter search result by state) has combined set of Tasks and Jobs states

BEFORE:
before - take 1

AFTER:
after

\cc @Fryguy @gtanzillo @dclarizio

@miq-bot miq-bot added the wip label Jan 25, 2017
@yrudman yrudman force-pushed the remove-jobs-tabs-in-tasks-management branch 2 times, most recently from d1e5152 to 195164a Compare January 25, 2017 20:34
@yrudman yrudman changed the title [WIP] Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Jan 25, 2017
@yrudman
Copy link
Contributor Author

yrudman commented Jan 25, 2017

@miq-bot remove-label wip

@miq-bot miq-bot removed the wip label Jan 25, 2017
@yrudman yrudman mentioned this pull request Jan 25, 2017
Merged
@gtanzillo
Copy link
Member

@yrudman I think we'll need to add the zone filter to the tasks screen so that jobs can still be filtered by zone.

@yrudman yrudman force-pushed the remove-jobs-tabs-in-tasks-management branch from 195164a to 9047da2 Compare February 2, 2017 16:23
@yrudman
Copy link
Contributor Author

yrudman commented Feb 3, 2017

@gtanzillo 'zone' column added to MiqTask model and included in data migration. Zone filter should be operational now

@yrudman yrudman changed the title Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) [WIP] Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Feb 8, 2017
@miq-bot miq-bot added the wip label Feb 8, 2017
@yrudman
Copy link
Contributor Author

yrudman commented Feb 8, 2017

@miq-bot add-label wip

@miq-bot miq-bot changed the title [WIP] Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Feb 8, 2017
@miq-bot miq-bot added wip and removed wip labels Feb 8, 2017
@yrudman yrudman changed the title Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) [WIP] Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Feb 8, 2017
@miq-bot
Copy link
Member

miq-bot commented Feb 27, 2017

This pull request is not mergeable. Please rebase and repush.

@yrudman yrudman force-pushed the remove-jobs-tabs-in-tasks-management branch from 9047da2 to 9d3085f Compare March 8, 2017 21:42
@miq-bot
Copy link
Member

miq-bot commented Mar 29, 2017

This pull request is not mergeable. Please rebase and repush.

@yrudman yrudman force-pushed the remove-jobs-tabs-in-tasks-management branch 2 times, most recently from 520638a to 470d3b8 Compare April 5, 2017 18:24
@yrudman yrudman force-pushed the remove-jobs-tabs-in-tasks-management branch 2 times, most recently from 78a09cc to e6f4f65 Compare April 5, 2017 19:57
@miq-bot
Copy link
Member

miq-bot commented Apr 7, 2017

This pull request is not mergeable. Please rebase and repush.

@yrudman yrudman force-pushed the remove-jobs-tabs-in-tasks-management branch from e6f4f65 to fb81bb8 Compare April 7, 2017 13:33
@miq-bot
Copy link
Member

miq-bot commented Apr 7, 2017

Checked commits yrudman/manageiq-ui-classic@44022db~...fb81bb8 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
11 files checked, 0 offenses detected
Everything looks good. 🍪

@yrudman
Copy link
Contributor Author

yrudman commented Apr 7, 2017

@miq-bot add-label fine/no

@miq-bot miq-bot added the fine/no label Apr 7, 2017
@yrudman
Copy link
Contributor Author

yrudman commented Apr 7, 2017

@gtanzillo @dclarizio This is first iteration on merging Job and MiqTask UI screens.
There would be more changes but PR would be on model side:

  • add Owner (may be rename it to Server) column which were available on Job screens
  • refactor logic around Owner Message column

@yrudman yrudman changed the title [WIP] Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Merge jobs and tasks layouts (leave only 'My Tasks' and 'All Tasks' tabs) Apr 7, 2017
@miq-bot miq-bot removed the wip label Apr 7, 2017
@yrudman
Copy link
Contributor Author

yrudman commented Apr 7, 2017

@miq-bot remove-label pending core

@dclarizio dclarizio added the tasks label Apr 7, 2017
This was referenced Apr 7, 2017
Closed
Merged
@mzazrivec mzazrivec added this to the Sprint 59 Ending Apr 24, 2017 milestone Apr 18, 2017
mzazrivec
mzazrivec reviewed Apr 18, 2017
View reviewed changes
app/controllers/miq_task_controller.rb
@@ -376,7 +306,7 @@ def build_query_for_status(opts)
end

def build_query_for_queued
["(#{db_table}state=? OR #{db_table}state=?)", %w(waiting_to_start Queued)]
["(miq_tasks.state=? OR miq_tasks.state=?)", %w(Waiting_to_start Queued)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yrudman I know this code has been there before. But in the future, these parts should be moved into
backend and UI should only call nice backend methods rather than constructing sqls like this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mzazrivec absolutely agreed !

@mzazrivec mzazrivec merged commit 680b180 into ManageIQ:master Apr 18, 2017
@yrudman yrudman mentioned this pull request Apr 27, 2017
Merged
@yrudman yrudman mentioned this pull request May 24, 2017
Merged
@yrudman yrudman deleted the remove-jobs-tabs-in-tasks-management branch July 20, 2017 13:00
@yrudman yrudman mentioned this pull request Oct 30, 2018
Merged
yrudman added a commit to yrudman/manageiq-ui-classic that referenced this pull request Oct 30, 2018
@yrudman
rescue error when not permitted signal sent. This bug introduced in M…
16ff62f 
…anageIQ#242

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1640704
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mzazrivec mzazrivec mzazrivec left review comments

@h-kataria h-kataria Awaiting requested review from h-kataria

Assignees

@dclarizio dclarizio

Labels
enhancement tasks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@yrudman @gtanzillo @miq-bot @mzazrivec @chessbyte @dclarizio