Identify invalid Catalog Items/Bundles in the UI #6448

hstastna · 2019-11-25T16:40:50Z

Issue: #6320
DEPENDS ON: ManageIQ/manageiq-decorators#26 (merged)

This PR:

adds a new column Valid in the list view to display whether the Catalog Item/Bundle is valid or not
displays warning as a flash message in the Catalog Item/Bundle details screen, if the item is invalid
makes Order button disabled for any invalid items

After:
Services > Catalogs > Catalog Items:

Services > Catalogs > Service Catalogs:

Services > Catalogs > Service Catalogs, details' screen of a selected Service:

Services > Catalogs > Catalog Items, details' screen of a selected Service:

hstastna · 2019-11-25T16:44:38Z

@miq-bot add_label services, enhancement

hstastna · 2019-12-03T12:22:20Z

@h-kataria This is ready for review. Thanks ❇️

app/controllers/application_controller.rb

martinpovolny · 2019-12-17T21:36:11Z

Let's talk what you need to do and how to do it in a generic way.

Let's investigate there's / there's not already someone else doing it elsewhere.

If an exception is really needed from the generic behavior, let's put it closest to the place where it's actually needed.

hstastna · 2019-12-18T10:54:20Z

@martinpovolny Thank you very much for the review. Yes, let's talk about this. I am not happy about my changes, too. And I haven't found any better possibilities yet.

There is some more info in #6320
Also, it looks like Laura was working on the same issue some longer time ago: ManageIQ/manageiq#4415

hstastna · 2020-01-28T12:17:27Z

@miq-bot add_reviewer @skateman

app/controllers/catalog_controller.rb

skateman · 2020-01-29T09:00:52Z

app/views/catalog/_svccat_tree_show.html.haml

@@ -44,10 +44,12 @@
    .form-group
      .col-md-1{:align => "center"}
        #buttons
+          - template_invalid = Array(@flash_array).any? { |f| f[:level] == :warning }


This is probably not how we want to do it, you have access to the @record, use that instead.

Yes, thank you, I know. 👍 I was about to change it but you were faster.

skateman · 2020-01-29T09:19:56Z

app/controllers/application_controller.rb

-        :onclick   => "#{@row_button[:function]}(\"#{row['id']}\");"
-      }
+      # Append a button if @row_button is set and the button is defined in the related decorator
+      button = item.decorate.try(:gtl_button_cell, row['id'], @row_button[:label], @row_button[:title], @row_button[:function]) if @row_button


Suggested change

button = item.decorate.try(:gtl_button_cell, row['id'], @row_button[:label], @row_button[:title], @row_button[:function]) if @row_button

button = item.decorate.try(:gtl_button_cell, row['id'], @row_button.permit(:label, :function, :title)) if @row_button

This way you can access the params in the decorator and decrease the number of arguments.

Even better if we move the constants from @row_button into the decorator and keep it here as a boolean. Let's talk about this when you're at the office.

hstastna · 2020-01-29T12:29:12Z

@miq-bot add_label pending core

hstastna · 2020-01-29T12:29:33Z

@miq-bot remove_label wip

skateman · 2020-01-29T12:30:45Z

app/controllers/catalog_controller.rb

-        @row_button = {:label    => _("Order"),
-                       :function => "miqOrderService",
-                       :title    => _("Order this Service")} # Show a button instead of the checkbox
+        @row_button = true # Show a button instead of the checkbox


You can make this a one-liner:

Suggested change

@row_button = true # Show a button instead of the checkbox

# Show a button instead of the checkbox

@row_button = true if role_allows?(:feature => 'svc_catalog_provision')

skateman · 2020-01-29T12:31:23Z

app/views/catalog/_svccat_tree_show.html.haml

+                       :alt      => t = @template_valid ? _("Order this Service") : _("This Service cannot be ordered"),
+                       :title    => t,
+                       :disabled => !@template_valid,
+                       :onclick  => "miqOrderService(#{@record.id})")


You can reuse the information from the decorator here...

skateman · 2020-01-29T13:09:27Z

@miq-bot rm_label pending core

skateman

Issue: ManageIQ#6320

mzazrivec · 2020-01-29T16:08:16Z

@hstastna The current CI failures seem related.

miq-bot · 2020-01-29T16:23:48Z

Checked commits hstastna/manageiq-ui-classic@50d6bdf~...f4d2fb4 with ruby 2.5.5, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
4 files checked, 0 offenses detected
Everything looks fine. 👍

miq-bot added the wip label Nov 25, 2019

hstastna force-pushed the Identify_invalid_catalog_items branch 2 times, most recently from eabfb89 to e8b10bc Compare November 26, 2019 15:48

miq-bot added enhancement services labels Nov 26, 2019

hstastna force-pushed the Identify_invalid_catalog_items branch 3 times, most recently from 6979c64 to cb5a189 Compare November 27, 2019 10:28

hstastna changed the title ~~[WIP] Identify invalid Catalog Items/Bundles in the UI~~ Identify invalid Catalog Items/Bundles in the UI Nov 27, 2019

miq-bot added unmergeable and removed wip labels Nov 27, 2019

hstastna force-pushed the Identify_invalid_catalog_items branch from cb5a189 to 187f11e Compare December 3, 2019 12:20

miq-bot removed the unmergeable label Dec 4, 2019

hstastna mentioned this pull request Dec 5, 2019

Need to identify invalid catalog items/bundles in the UI #6320

Closed

hstastna force-pushed the Identify_invalid_catalog_items branch from 187f11e to a3ec01d Compare December 10, 2019 13:55

martinpovolny reviewed Dec 17, 2019

View reviewed changes

app/controllers/application_controller.rb Outdated Show resolved Hide resolved

martinpovolny requested a review from mzazrivec December 17, 2019 21:28

miq-bot requested a review from skateman January 28, 2020 12:18

hstastna force-pushed the Identify_invalid_catalog_items branch from a3ec01d to e23761c Compare January 28, 2020 12:22

hstastna changed the title ~~Identify invalid Catalog Items/Bundles in the UI~~ [WIP] Identify invalid Catalog Items/Bundles in the UI Jan 28, 2020

miq-bot added the wip label Jan 28, 2020

hstastna force-pushed the Identify_invalid_catalog_items branch 2 times, most recently from 82f5faa to 2d64f44 Compare January 28, 2020 17:49

hstastna mentioned this pull request Jan 28, 2020

Add gtl_button_cell to ServiceTemplateDecorator for valid/invalid Service ManageIQ/manageiq-decorators#26

Merged

skateman suggested changes Jan 29, 2020

View reviewed changes

hstastna force-pushed the Identify_invalid_catalog_items branch 4 times, most recently from 2995fd9 to cdd6af0 Compare January 29, 2020 12:15

hstastna changed the title ~~[WIP] Identify invalid Catalog Items/Bundles in the UI~~ Identify invalid Catalog Items/Bundles in the UI Jan 29, 2020

miq-bot added pending core and removed wip labels Jan 29, 2020

skateman reviewed Jan 29, 2020

View reviewed changes

hstastna force-pushed the Identify_invalid_catalog_items branch 3 times, most recently from 150ef99 to 7c365b3 Compare January 29, 2020 12:59

skateman approved these changes Jan 29, 2020

View reviewed changes

miq-bot removed the pending core label Jan 29, 2020

Hilda Stastna added 2 commits January 29, 2020 16:19

Add Valid Status column to the list view of Service Catalog Items

50d6bdf

Issue: ManageIQ#6320

Disable Order button for invalid Services in the list view

9083c0b

hstastna force-pushed the Identify_invalid_catalog_items branch from 7c365b3 to 7b5746a Compare January 29, 2020 15:19

mzazrivec closed this Jan 29, 2020

mzazrivec reopened this Jan 29, 2020

Disable Order button and add flash message to Catalog Item's details

f4d2fb4

hstastna force-pushed the Identify_invalid_catalog_items branch from 7b5746a to f4d2fb4 Compare January 29, 2020 16:18

mzazrivec approved these changes Jan 29, 2020

View reviewed changes

mzazrivec self-assigned this Jan 29, 2020

mzazrivec added this to the Sprint 129 Ending Feb 3, 2020 milestone Jan 29, 2020

mzazrivec merged commit a64a603 into ManageIQ:master Jan 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Identify invalid Catalog Items/Bundles in the UI #6448

Identify invalid Catalog Items/Bundles in the UI #6448

hstastna commented Nov 25, 2019 •

edited

Loading

hstastna commented Nov 25, 2019

hstastna commented Dec 3, 2019

martinpovolny commented Dec 17, 2019

hstastna commented Dec 18, 2019

hstastna commented Jan 28, 2020

skateman Jan 29, 2020

hstastna Jan 29, 2020 •

edited

Loading

skateman Jan 29, 2020

skateman Jan 29, 2020

hstastna commented Jan 29, 2020

hstastna commented Jan 29, 2020

skateman Jan 29, 2020

skateman Jan 29, 2020

skateman commented Jan 29, 2020

skateman left a comment

mzazrivec commented Jan 29, 2020

miq-bot commented Jan 29, 2020

	button = item.decorate.try(:gtl_button_cell, row['id'], @row_button[:label], @row_button[:title], @row_button[:function]) if @row_button
	button = item.decorate.try(:gtl_button_cell, row['id'], @row_button.permit(:label, :function, :title)) if @row_button

	@row_button = true # Show a button instead of the checkbox
	# Show a button instead of the checkbox
	@row_button = true if role_allows?(:feature => 'svc_catalog_provision')

Identify invalid Catalog Items/Bundles in the UI #6448

Identify invalid Catalog Items/Bundles in the UI #6448

Conversation

hstastna commented Nov 25, 2019 • edited Loading

hstastna commented Nov 25, 2019

hstastna commented Dec 3, 2019

martinpovolny commented Dec 17, 2019

hstastna commented Dec 18, 2019

hstastna commented Jan 28, 2020

skateman Jan 29, 2020

Choose a reason for hiding this comment

hstastna Jan 29, 2020 • edited Loading

Choose a reason for hiding this comment

skateman Jan 29, 2020

Choose a reason for hiding this comment

skateman Jan 29, 2020

Choose a reason for hiding this comment

hstastna commented Jan 29, 2020

hstastna commented Jan 29, 2020

skateman Jan 29, 2020

Choose a reason for hiding this comment

skateman Jan 29, 2020

Choose a reason for hiding this comment

skateman commented Jan 29, 2020

skateman left a comment

Choose a reason for hiding this comment

mzazrivec commented Jan 29, 2020

miq-bot commented Jan 29, 2020

hstastna commented Nov 25, 2019 •

edited

Loading

hstastna Jan 29, 2020 •

edited

Loading