[WIP] Add new selector for Chargeback Rate editing screen to select the base model #4001

hstastna · 2018-05-29T13:00:09Z

Partially fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1581817
Needs to merge with:
ManageIQ/manageiq#17507
ManageIQ/manageiq-schema#304 (new alternative of ManageIQ/manageiq-schema#209)

What:
When choosing Chargeback for Images/Projects/Vms under Configure Report Columns section while adding a new/editing an existing Report under Cloud Intel > Reports > Reports, some of the fields are not available. This is ok but there was a misunderstanding that those fields were missing there. This is why I add note/info about which fields are not supported to the Report editing screen (in another PR: #4081), and also new selector for Chargeback Rate editing screen (under Cloud Intel > Chargeback > Rates) is added to choose what the Rate is based on (Images/Projects/Vms) (this PR). We call it the base model (see ManageIQ/manageiq-schema#209).

Before:
Adding/editing a Chargeback Rate:

Displaying details page of a Chargeback Rate:

After:
Adding a new Chargeback Rate (the Rate Details table is displayed after choosing one of the "base models" by the new drop down because the rate details depend on it):

The new selector for configuring Rate columns (for choosing the base model), in editing screen:

Adding/editing an existing Chargeback Rate with base model:
(After changing the model, the Rate Details table is cleared to its default values, similarly as for Reports, and the columns of the table are updated according to the chosen base model: only appropriate columns are displayed for each base model)

Displaying details page of a new Chargeback Rate, with the base model:

Displaying details page of a Chargeback Rate, without the base model (all the existing rates):
(The rate is based on 'Any' as its details' table has all the available/any columns)

Editing the Chargeback Rate without the base model:
('Any' option is also available - user can see all the original details' values and edit them)

Changing the base model of the Chargeback Rate without the base model:
(While changing the base model from "Any" to any other, user will not lose his original details' values, the table will not be reset to its default values as usually, only the appropriate columns display - with already existing values of the rate, already saved in the DB)

Saving the Chargeback Rate without the base model:

Note:
Copying of the Rate with/without base model also works but it will not be possible to save the Rate based on 'Any'.

lpichler

great! It looks good to me 👍

lpichler · 2018-05-29T15:11:24Z

@miq-bot assign @mzazrivec

skateman · 2018-05-30T08:08:12Z

app/views/chargeback/_cb_rate_edit.html.haml

+    %br
+    = _('* Caution: Allocated CPU Count/Cores, Used CPU, Used Disk I/O and Allocated Memory are not supported for Chargeback for Projects. ')
+    %br
+    = _('* Caution: Allocated/Used CPU Cores are not supported for Chargeback for Vms. ')


Could we just rephrase these into a single sentence on a single line?

I don't understand how. These are three different sentences how would you like to put it into one ?

keyword: rephrase 😉

There are three things: Chargeback for Images, Projects, Vms. We need to inform which fields are not supported for each of them. How would you put so much info into the one line to keep readability? Anyway, I see later comments and it looks like there will be completely different solution to what I was told to do here.

Well, for me it looks weird to have a lot of warning signs...something like this in real life:

Well, four lines of "Caution" is also too much for me but here it is not possible to put all the info in one line and to keep readability, it's too much info to put just into one line. Anyway, I was told to do so.. Aaand.. now I was told to do it completely differently so don't worry about this, I will udpate the PR soon! ;)

skateman · 2018-05-30T08:09:11Z

app/views/report/_form_columns.html.haml

+        - report_base = @edit[:new][:model].titleize.split(' ').last.pluralize
+        %br
+        %strong
+          = _("* Caution: #{unavailable_fields} are not supported for Chargeback for #{report_base}.")


This is probably not okay from the translation side, you need to use the % operator.

skateman · 2018-05-30T08:09:40Z

app/views/report/_form_columns.html.haml

+    - if @edit[:new][:model] && @edit[:new][:model].starts_with?('Chargeback')
+      - unavailable_fields = unavailable_fields_for_model
+      - if unavailable_fields
+        - report_base = @edit[:new][:model].titleize.split(' ').last.pluralize


Translation missing here, probably ui_lookup but not sure.

Here I don't display anything so I don't think so. I think I miss ui_lookup later.

You're displaying report_base a few lines below.

Yes, this is what i meant by "later".

skateman · 2018-05-30T08:10:49Z

app/controllers/report_controller.rb

@@ -274,6 +274,19 @@ def title

  private

+  # Get string with unavailable fields for displaying note about them while adding/editing report
+  def unavailable_fields_for_model
+    case @edit[:new][:model]


Instead of testing for the @edit[:new][:model] I would make this method more universal by using an argument instead.

skateman · 2018-05-30T08:10:59Z

app/controllers/report_controller.rb

+      'Allocated CPU Count, Used CPU, Used Disk I/O and Used Network I/O'
+    when 'ChargebackContainerProject'
+      'Allocated CPU Count/Cores, Used CPU, Used Disk I/O and Allocated Memory'
+    end


Translations?

I wouldn't use ui_lookup here. Or did you mean anything else?

martinpovolny · 2018-05-30T08:33:55Z

I don't like the fact, that the information about fields that are not allowed for chargeback is in the UI. Practically in the views.

This should come from the backend.

lpichler · 2018-05-30T08:52:17Z

after clarification with @martinpovolny we will do the different solution. It will be about "Chargeback Rates for concrete type of report"

hstastna · 2018-06-11T09:08:47Z

Changes for Reports moved to another PR.

miq-bot · 2018-09-05T16:22:49Z

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

miq-bot · 2019-03-11T04:00:22Z

This pull request has been automatically closed because it has not been updated for at least 6 months.

Feel free to reopen this pull request if these changes are still valid.

Thank you for all your contributions!

miq-bot · 2019-03-12T14:57:44Z

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

https://bugzilla.redhat.com/show_bug.cgi?id=1581817

Show also the info about no base model set (for already existing rates) as Rate based on 'Any'.

Also, add flash message to inform that setting the base model for the rate is required.

Edit/simplify the method by moving setting the rate details to the new method cb_rate_set_details

@edit

Save the id to @edit to be able to get the original Rate details while copying the rate and changing the base model. This is important for 'older' rates with no base model set before for not losing the original details.

Also, reset the Rate Details according to the base model if the base model was changed by user.

@edit

Add simple condition 'if @edit[:new][:model]' and '#rate_edit_details' to rate edit table haml to be able to easily refresh/display or not display the table if report base model was not set yet.

miq-bot · 2019-03-28T15:52:01Z

Checked commits hstastna/manageiq-ui-classic@9a33fff~...c3623ce with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
4 files checked, 1 offense detected

**

💣 💥 🔥 🚒 - Linter/Haml - Linter::Haml STDERR:

warning: parser/current is loading parser/ruby23, which recognizes
warning: 2.3.6-compliant syntax, but you are running 2.3.3.
warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.

hstastna changed the title ~~[WIP] Add missing note about unavailable fields while editing report~~ [WIP] Add missing info about unavailable fields while editing report May 29, 2018

miq-bot added the wip label May 29, 2018

hstastna force-pushed the Cannot_Create_VM_Chargeback_Reports_with_CPU_Cores branch 4 times, most recently from 6875c28 to 3170e58 Compare May 29, 2018 13:14

hstastna changed the title ~~[WIP] Add missing info about unavailable fields while editing report~~ [WIP] Add missing info about unavailable fields while editing report/rate May 29, 2018

hstastna force-pushed the Cannot_Create_VM_Chargeback_Reports_with_CPU_Cores branch 5 times, most recently from acb74f4 to 662d6f9 Compare May 29, 2018 14:06

hstastna changed the title ~~[WIP] Add missing info about unavailable fields while editing report/rate~~ [WIP] Add missing info about unavailable fields while adding/editing report/rate May 29, 2018

hstastna changed the title ~~[WIP] Add missing info about unavailable fields while adding/editing report/rate~~ Add missing info about unavailable fields while adding/editing report/rate May 29, 2018

miq-bot removed the wip label May 29, 2018

lpichler approved these changes May 29, 2018

View reviewed changes

miq-bot assigned mzazrivec May 29, 2018

mzazrivec added bug enhancement overview/chargeback labels May 30, 2018

skateman suggested changes May 30, 2018

View reviewed changes

hstastna changed the title ~~Add missing info about unavailable fields while adding/editing report/rate~~ [WIP] Add missing info about unavailable fields while adding/editing report/rate May 30, 2018

miq-bot added the wip label May 30, 2018

hstastna force-pushed the Cannot_Create_VM_Chargeback_Reports_with_CPU_Cores branch 4 times, most recently from 2c32744 to ee1ddd7 Compare June 1, 2018 12:33

hstastna changed the title ~~[WIP] Add missing info about unavailable fields while adding/editing report/rate~~ [WIP] Add missing info about unavailable fields while adding/editing Chargeback Rate Jun 7, 2018

hstastna changed the title ~~[WIP] Add missing info about unavailable fields while adding/editing Chargeback Rate~~ [WIP] Add new selector for Chargeback Rate editing screen to select the Rate base model Jun 7, 2018

hstastna changed the title ~~[WIP] Add new selector for Chargeback Rate editing screen to select the Rate base model~~ [WIP] Add new selector for Chargeback Rate editing screen to select the base model Jun 7, 2018

hstastna force-pushed the Cannot_Create_VM_Chargeback_Reports_with_CPU_Cores branch 2 times, most recently from adaac83 to 169bfd1 Compare June 7, 2018 11:26

hstastna mentioned this pull request Jun 7, 2018

[WIP] Add missing info about unavailable fields while adding/editing Report #4081

Closed

hstastna force-pushed the Cannot_Create_VM_Chargeback_Reports_with_CPU_Cores branch 2 times, most recently from f2cd3db to a7b811f Compare June 7, 2018 13:29

hstastna mentioned this pull request Aug 9, 2018

Add column report_base_model to ChargebackRate table ManageIQ/manageiq-schema#209

Merged

miq-bot added the unmergeable label Sep 5, 2018

miq-bot closed this Mar 11, 2019

himdel reopened this Mar 12, 2019

hstastna added 2 commits March 28, 2019 16:24

Add a new selector for configuring Rate columns to editing screen

9a33fff

https://bugzilla.redhat.com/show_bug.cgi?id=1581817

Add info about base model to Rate details page

21b22e6

Show also the info about no base model set (for already existing rates) as Rate based on 'Any'.

hstastna force-pushed the Cannot_Create_VM_Chargeback_Reports_with_CPU_Cores branch from a7b811f to 3c33d98 Compare March 28, 2019 15:33

hstastna added 5 commits March 28, 2019 16:40

Save the base model to @Rate variable when adding/saving the new rate

e3bdf38

Also, add flash message to inform that setting the base model for the rate is required.

Update the Rate Details table according to the selected base model

e1f7d64

Edit cb_rate_set_form_vars method

ef5c483

Edit/simplify the method by moving setting the rate details to the new method cb_rate_set_details

Save the original id of the rate while copying the rate

fa2198f

Save the id to @edit to be able to get the original Rate details while copying the rate and changing the base model. This is important for 'older' rates with no base model set before for not losing the original details.

Save the new base model to @edit while adding/editing rate

c317d24

Also, reset the Rate Details according to the base model if the base model was changed by user.

hstastna force-pushed the Cannot_Create_VM_Chargeback_Reports_with_CPU_Cores branch from 3c33d98 to c317d24 Compare March 28, 2019 15:40

Add condition for rate edit table to display/refresh the table

c3623ce

Add simple condition 'if @edit[:new][:model]' and '#rate_edit_details' to rate edit table haml to be able to easily refresh/display or not display the table if report base model was not set yet.

miq-bot removed the unmergeable label Mar 29, 2019

lpichler mentioned this pull request Apr 2, 2019

[WIP] Method for filtered rate for chargeback models ManageIQ/manageiq#18612

Closed

1 task

hstastna closed this Apr 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Add new selector for Chargeback Rate editing screen to select the base model #4001

[WIP] Add new selector for Chargeback Rate editing screen to select the base model #4001

hstastna commented May 29, 2018 •

edited

lpichler left a comment

lpichler commented May 29, 2018

skateman May 30, 2018

lpichler May 30, 2018

skateman May 30, 2018 •

edited

hstastna May 30, 2018

skateman May 30, 2018

hstastna May 30, 2018 •

edited

skateman May 30, 2018

skateman May 30, 2018

hstastna May 30, 2018

skateman May 30, 2018

hstastna May 30, 2018

skateman May 30, 2018

skateman May 30, 2018

hstastna May 30, 2018

skateman May 30, 2018

martinpovolny commented May 30, 2018

lpichler commented May 30, 2018 •

edited

hstastna commented Jun 11, 2018

miq-bot commented Sep 5, 2018

miq-bot commented Mar 11, 2019

miq-bot commented Mar 12, 2019

miq-bot commented Mar 28, 2019

[WIP] Add new selector for Chargeback Rate editing screen to select the base model #4001

[WIP] Add new selector for Chargeback Rate editing screen to select the base model #4001

Conversation

hstastna commented May 29, 2018 • edited

lpichler left a comment

Choose a reason for hiding this comment

lpichler commented May 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

skateman May 30, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hstastna May 30, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

martinpovolny commented May 30, 2018

lpichler commented May 30, 2018 • edited

hstastna commented Jun 11, 2018

miq-bot commented Sep 5, 2018

miq-bot commented Mar 11, 2019

miq-bot commented Mar 12, 2019

miq-bot commented Mar 28, 2019

hstastna commented May 29, 2018 •

edited

skateman May 30, 2018 •

edited

hstastna May 30, 2018 •

edited

lpichler commented May 30, 2018 •

edited