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.

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

BZ#1499692-Added Loading indicator to Dialogs #1258

Merged
merged 6 commits into from
Dec 12, 2017
Merged

BZ#1499692-Added Loading indicator to Dialogs #1258

merged 6 commits into from
Dec 12, 2017

Conversation

chalettu
Copy link
Contributor

@chalettu chalettu commented Nov 22, 2017

@AllenBW
Copy link
Member

AllenBW commented Dec 4, 2017

@chalettu can yah provide a status update on the what work is on progress for this one?

@chalettu
Copy link
Contributor Author

chalettu commented Dec 4, 2017

We use dialogs in 3 places in SUI and so far in this PR I got 1 of the 3 places working where we use dialogs and its tests updated. Still have custom button details and service reconfigure pages to go for fixing code and tests.

@chalettu chalettu requested a review from himdel as a code owner December 8, 2017 18:43
@chalettu
Copy link
Contributor Author

chalettu commented Dec 8, 2017

@miq-bot add_label gaprindashvili/yes
@miq-bot add_label enhancement
@miq-bot add_label ux/review

@chalettu
Copy link
Contributor Author

chalettu commented Dec 8, 2017

Screenshot of loading indicator for dialogs
loading_indicator

@chalettu chalettu changed the title [WIP] Added Loading indicator to Dialogs Added Loading indicator to Dialogs Dec 8, 2017
@miq-bot miq-bot removed the wip label Dec 8, 2017
@Loicavenel
Copy link

@chalettu looks good to me..
@serenamarie125 Should we add more text to be more explicit? "Loading Dialog"

AllenBW
AllenBW previously approved these changes Dec 11, 2017
Copy link
Member

@AllenBW AllenBW left a comment

Choose a reason for hiding this comment

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

LG2M Great work @chalettu !

@AllenBW AllenBW added this to the Sprint 75 Ending Dec 11, 2017 milestone Dec 11, 2017
@miq-bot
Copy link
Member

miq-bot commented Dec 11, 2017

Checked commits https://github.com/chalettu/manageiq-ui-service/compare/8153741f2f39643e09775ea2cf721e1efa6d0796~...c81288483d8d18f803c73b3104fb9dfe126563d0 with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
0 files checked, 0 offenses detected
Everything looks fine. ⭐

@serenamarie125
Copy link

I think the current text works fine! @AllenBW

Copy link

@serenamarie125 serenamarie125 left a comment

Choose a reason for hiding this comment

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

LGTM!

@serenamarie125
Copy link

@miq-bot add_label ux/approved

@serenamarie125
Copy link

@miq-bot remove_label ux/review

@AllenBW AllenBW changed the title Added Loading indicator to Dialogs BZ#1499692-Added Loading indicator to Dialogs Dec 12, 2017
Copy link
Member

@AllenBW AllenBW left a comment

Choose a reason for hiding this comment

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

Looks goooooooood! <3 🙇‍♀️

@AllenBW AllenBW merged commit 8a64b77 into ManageIQ:master Dec 12, 2017
@AllenBW AllenBW deleted the dialog-loading-fix branch December 12, 2017 14:42
@simaishi
Copy link
Contributor

@chalettu @AllenBW The BZ has cfme-5.8.z flag. Is it ok to backport to Fine branch?

@AllenBW
Copy link
Member

AllenBW commented Dec 12, 2017

@simaishi are there any conflicts? This pr touches many files... if I was a betting person, would suspect there would be a few conflicts... 🤔

simaishi pushed a commit that referenced this pull request Dec 12, 2017
BZ#1499692-Added Loading indicator to Dialogs
(cherry picked from commit 8a64b77)

https://bugzilla.redhat.com/show_bug.cgi?id=1525091
@simaishi
Copy link
Contributor

Gaprindashvili backport details:

$ git log -1
commit 293a5fb5e20978c253d74e442035fd8f32142902
Author: Allen Wight <allen.b.wight@gmail.com>
Date:   Tue Dec 12 09:42:49 2017 -0500

    Merge pull request #1258 from chalettu/dialog-loading-fix
    
    BZ#1499692-Added Loading indicator to Dialogs
    (cherry picked from commit 8a64b773bb1a1a623c81463c1cc9adb93cd9b3d1)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1525091

@simaishi
Copy link
Contributor

are there any conflicts?

I ask if I should even attempt to backport first (as a fix could be something completely different for different branches) 😄

I tried it now, all but 1 file is conflicting... marking as fine/conflict

Changes to be committed:

	modified:   client/app/states/catalogs/details/details.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   client/app/states/catalogs/details/details.state.js
	both modified:   client/app/states/catalogs/details/details.state.spec.js
	both modified:   client/app/states/services/custom_button_details/custom_button_details.html
	both modified:   client/app/states/services/custom_button_details/custom_button_details.state.js
	both modified:   client/app/states/services/custom_button_details/custom_button_details.state.spec.js
	both modified:   client/app/states/services/reconfigure/reconfigure.html
	both modified:   client/app/states/services/reconfigure/reconfigure.state.js
	both modified:   client/app/states/services/reconfigure/reconfigure.state.spec.js

@AllenBW
Copy link
Member

AllenBW commented Dec 12, 2017

@chalettu can you look into possibly making a separate fine pr for this?

@chalettu
Copy link
Contributor Author

Yeah, I will start on it now that this one got merged.

@simaishi
Copy link
Contributor

Backported to Fine via #1341

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

Successfully merging this pull request may close these issues.

7 participants