From dd3d4703431503e3e32a1707981de57847427493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Wed, 24 Jul 2019 14:39:37 +0200 Subject: [PATCH] Drop the no longer necessary dialog user views --- .../_auto_refresh_javascript.html.haml | 9 --- .../shared/dialogs/_dialog_field.html.haml | 71 ------------------- .../dialogs/_dialog_field_check_box.html.haml | 23 ------ ...field_date_and_date_time_control.html.haml | 46 ------------ .../_dialog_field_drop_down_list.html.haml | 40 ----------- .../_dialog_field_radio_button.html.haml | 50 ------------- .../_dialog_field_text_area_box.html.haml | 26 ------- .../dialogs/_dialog_field_text_box.html.haml | 33 --------- .../shared/dialogs/_dialog_group.html.haml | 14 ---- .../shared/dialogs/_dialog_tab.html.haml | 7 -- ...log_field_drop_down_list.html.haml_spec.rb | 18 ----- 11 files changed, 337 deletions(-) delete mode 100644 app/views/shared/dialogs/_auto_refresh_javascript.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_check_box.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_radio_button.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_text_area_box.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_field_text_box.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_group.html.haml delete mode 100644 app/views/shared/dialogs/_dialog_tab.html.haml delete mode 100644 spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb diff --git a/app/views/shared/dialogs/_auto_refresh_javascript.html.haml b/app/views/shared/dialogs/_auto_refresh_javascript.html.haml deleted file mode 100644 index 838151ea9d7..00000000000 --- a/app/views/shared/dialogs/_auto_refresh_javascript.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -:javascript - dialogFieldRefresh.listenForAutoRefreshMessages(JSON.parse("#{j(auto_refresh_options.to_json)}"), function(initializingIndex) { - dialogFieldRefresh.refreshField(JSON.parse("#{j(refresh_field_parameters.to_json)}"), function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_listening_options(auto_refresh_options, true).to_json)}'); - jsonOptions.initializingIndex = initializingIndex; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field.html.haml b/app/views/shared/dialogs/_dialog_field.html.haml deleted file mode 100644 index b28f23f270f..00000000000 --- a/app/views/shared/dialogs/_dialog_field.html.haml +++ /dev/null @@ -1,71 +0,0 @@ -- url = url_for_only_path(:action => 'dialog_field_changed', :id => @edit[:rec_id] || "new") if @edit -- dialog_mode = @edit[:dialog_mode] if @edit - -- case dialog_mode -- when :reconfigure - - edit = field.reconfigurable -- when :review - - edit = false -- else - - edit = !@edit.nil? - -.form-group{:id => "field_#{field.id}_tr", :style => field.visible ? 'display:block' : 'display:none'} - %label.control-label.col-md-2{:title => field.description} - = field.label - .col-md-8{:title => field.description} - - current_index = auto_refreshable_field_indicies.find_index(:tab_index => tab_index, - :group_index => group_index, - :field_index => field_index, - :auto_refresh => !!field.auto_refresh) - - auto_refresh_options = {:tab_index => tab_index, - :group_index => group_index, - :field_index => field_index, - :auto_refreshable_field_indicies => auto_refreshable_field_indicies, - :trigger => field.trigger_auto_refresh, - :current_index => current_index} - -# Don't show refresh buttons on Requests page - - show_refresh_button = field.show_refresh_button? && !controller.kind_of?(MiqRequestController) - - locals = {:edit => edit, - :field => field, - :url => url, - :wf => wf, - :auto_refresh_options => auto_refresh_options, - :show_refresh_button => show_refresh_button} - - case field.type - - when 'DialogFieldTextBox' - = render(:partial => "shared/dialogs/dialog_field_text_box", :locals => locals) - - - when 'DialogFieldTextAreaBox' - = render(:partial => "shared/dialogs/dialog_field_text_area_box", :locals => locals) - - - when 'DialogFieldCheckBox' - = render(:partial => "shared/dialogs/dialog_field_check_box", :locals => locals) - - - when 'DialogFieldDateControl', 'DialogFieldDateTimeControl' - = render(:partial => "shared/dialogs/dialog_field_date_and_date_time_control", :locals => locals) - - - when "DialogFieldRadioButton" - = render(:partial => "shared/dialogs/dialog_field_radio_button", :locals => locals) - - - when "DialogFieldDropDownList" - = render(:partial => "shared/dialogs/dialog_field_drop_down_list", :locals => locals) - - - when 'DialogFieldButton' - = button_tag(_("Save"), :class => edit ? 'btn btn-primary' : 'btn btn-primary disabled') - - - when 'DialogFieldTagControl' - - if edit - = select_tag(field.name, - options_for_select(dialog_dropdown_select_values(field), wf.value(field.name)), - drop_down_options(field, url)) - :javascript - dialogFieldRefresh.initializeDialogSelectPicker('#{field.name}', undefined, '#{url}', JSON.parse('#{j(auto_refresh_options.to_json)}')); - - - else - - value = wf.value(field.name) || '' # it returns in format for example Clasification::id - - _, classification_id = value.split('::') - - current_classification = Classification.find_by(:id => classification_id) - = h(current_classification.nil? ? '' : current_classification.description) - - :javascript - dialogFieldRefresh.setVisible($('#field_#{field.id}_tr'), #{field.visible}); diff --git a/app/views/shared/dialogs/_dialog_field_check_box.html.haml b/app/views/shared/dialogs/_dialog_field_check_box.html.haml deleted file mode 100644 index 8b7659c89cf..00000000000 --- a/app/views/shared/dialogs/_dialog_field_check_box.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -= check_box_tag(field.name, "1", field.checked?, {:disabled => !edit}.merge(checkbox_tag_options(field, url, auto_refresh_options))) - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-checkbox-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-checkbox-#{field.id}').click(function() { - dialogFieldRefresh.refreshCheckbox("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml b/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml deleted file mode 100644 index a94cb480e80..00000000000 --- a/app/views/shared/dialogs/_dialog_field_date_and_date_time_control.html.haml +++ /dev/null @@ -1,46 +0,0 @@ -- if field.type == "DialogFieldDateControl" - - if edit - = datepicker_input_tag("miq_date__#{field.name}", field.value, date_tag_options(field, url, auto_refresh_options)) - - else - = field.value - -- if field.type == "DialogFieldDateTimeControl" - - date_val, time_val = field.value.split(" ") - - hour_val, minute_val = time_val.split(":") - - if edit - = datepicker_input_tag("miq_date__#{field.name}", date_val, date_tag_options(field, url, auto_refresh_options)) - - else - = date_val - -  at  - - if edit - = select_tag("start_hour", hour_select_options(hour_val), time_tag_options(field, url, "hour", auto_refresh_options)) - = ':' - = select_tag("start_min", minute_select_options(minute_val), time_tag_options(field, url, "min", auto_refresh_options)) - - - else - = "#{hour_val.rjust(2, '0')}:#{minute_val.rjust(2, '0')}" -   - = session[:user_tz] - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-date-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-date-#{field.id}').click(function() { - dialogFieldRefresh.refreshDateTime("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml b/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml deleted file mode 100644 index 3675d83dd85..00000000000 --- a/app/views/shared/dialogs/_dialog_field_drop_down_list.html.haml +++ /dev/null @@ -1,40 +0,0 @@ -- if edit - - select_values = field.values.collect(&:reverse) - - selected ||= wf.value(field.name) - = select_tag(field.name, options_for_select(select_values, - selected), - drop_down_options(field, url)) - - :javascript - dialogFieldRefresh.initializeDialogSelectPicker( - '#{field.name}', - '#{selected}', - '#{url}', - JSON.parse('#{j(auto_refresh_options.to_json)}') - ); - - - if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-field-#{field.id}').click(function() { - var selectedValue = $('select[name="#{field.name}"]').val(); - dialogFieldRefresh.refreshDropDownList("#{field.name}", "#{field.id}", selectedValue, function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); - -- else - = h(field.value.nil? ? "" : dialog_dropdown_selected_value(field)) diff --git a/app/views/shared/dialogs/_dialog_field_radio_button.html.haml b/app/views/shared/dialogs/_dialog_field_radio_button.html.haml deleted file mode 100644 index e51819f742f..00000000000 --- a/app/views/shared/dialogs/_dialog_field_radio_button.html.haml +++ /dev/null @@ -1,50 +0,0 @@ -- if edit - - if field.values.length > 1 - %span{:id => "dynamic-radio-#{field.id}"} - - field.values.each do |rb| - - %input{radio_options(field, url, rb[0], wf.value(field.name))} - %label.dynamic-radio-label= rb[1] - - :javascript - dialogFieldRefresh.initializeRadioButtonOnClick( - '#{field.id}', - '#{url}', - JSON.parse('#{j(auto_refresh_options.to_json)}') - ); - - - else - = h(field.values[0].last) unless field.values.empty? - -- else - = h(field.values.detect { |k, _v| k == wf.value(field.name) }.try(:last) || wf.value(field.name)) - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id, - :url => url, - :auto_refresh_options => auto_refresh_options}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-field-#{field.id}').click(function() { - var checkedValue = $('input:radio[name="#{field.name}"]:checked').val(); - - dialogFieldRefresh.refreshRadioList("#{field.name}", - "#{field.id}", - checkedValue, - "#{url}", - JSON.parse('#{j(auto_refresh_options.to_json)}'), function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml b/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml deleted file mode 100644 index 3e1157146f4..00000000000 --- a/app/views/shared/dialogs/_dialog_field_text_area_box.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -- if edit - = text_area_tag(field.name, field.value, textarea_tag_options(field, url, auto_refresh_options.merge(:initial_trigger => true))) -- else - = h(field.value) - -- if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-text-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-text-field-#{field.id}').click(function() { - dialogFieldRefresh.refreshTextAreaBox("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); diff --git a/app/views/shared/dialogs/_dialog_field_text_box.html.haml b/app/views/shared/dialogs/_dialog_field_text_box.html.haml deleted file mode 100644 index 778ad8f2eb4..00000000000 --- a/app/views/shared/dialogs/_dialog_field_text_box.html.haml +++ /dev/null @@ -1,33 +0,0 @@ -- if edit - - if field.protected? - = password_field_tag(field.name + "__protected", field.value, textbox_tag_options(field, url, auto_refresh_options.merge(:initial_trigger => true))) - - else - = text_field_tag(field.name, field.value, textbox_tag_options(field, url, auto_refresh_options.merge(:initial_trigger => true))) - - - if field.dynamic - - if field.auto_refresh - - javascript_locals = {:auto_refresh_options => auto_refresh_options, - :refresh_field_parameters => {:type => field.type, - :name => field.name, - :id => field.id}} - - = render(:partial => "shared/dialogs/auto_refresh_javascript", :locals => javascript_locals) - - - if show_refresh_button - = button_tag(_('Refresh'), :id => "refresh-dynamic-text-field-#{field.id}", :class => "btn btn-default") - - :javascript - $('#refresh-dynamic-text-field-#{field.id}').click(function() { - dialogFieldRefresh.refreshTextBox("#{field.name}", "#{field.id}", function() { - var jsonOptions = JSON.parse('#{j(auto_refresh_options.to_json)}'); - jsonOptions.initialTrigger = true; - - dialogFieldRefresh.triggerAutoRefresh(jsonOptions); - }); - }); - -- else - - if field.protected? - ******** - - else - = h(field.value) diff --git a/app/views/shared/dialogs/_dialog_group.html.haml b/app/views/shared/dialogs/_dialog_group.html.haml deleted file mode 100644 index dc968430fc7..00000000000 --- a/app/views/shared/dialogs/_dialog_group.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -%div{:id => "group_#{group.id}_div"} - %h3{:title => "#{group.description}"} - = group.label - - unless group.dialog_fields.empty? - .form-horizontal - - group.dialog_fields.each_with_index do |field, field_index| - = render :partial => "shared/dialogs/dialog_field", - :locals => {:wf => wf, - :field => field, - :field_index => field_index, - :group_index => group_index, - :tab_index => tab_index, - :auto_refreshable_field_indicies => auto_refreshable_field_indicies} - %hr diff --git a/app/views/shared/dialogs/_dialog_tab.html.haml b/app/views/shared/dialogs/_dialog_tab.html.haml deleted file mode 100644 index f987303f63b..00000000000 --- a/app/views/shared/dialogs/_dialog_tab.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -- tab.dialog_groups.each_with_index do |group, group_index| - = render :partial => "shared/dialogs/dialog_group", - :locals => {:wf => wf, - :group => group, - :group_index => group_index, - :tab_index => tab_index, - :auto_refreshable_field_indicies => auto_refreshable_field_indicies} diff --git a/spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb b/spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb deleted file mode 100644 index 5df1c693800..00000000000 --- a/spec/views/shared/dialogs/_dialog_field_drop_down_list.html.haml_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -describe "shared/dialogs/dialog_field_drop_down_list.html.haml" do - context 'display field value' do - before do - @edit = false - attributes = {:values => [[nil, ""], %w(Value1 Desc1), %w(Value2 Desc2)]} - value = 'Value2' - @field = DialogFieldDropDownList.new(:id => 1, - :name => 'Options List Field', - :type => 'DialogFieldDropDownList', - :attributes => attributes, :value => value) - end - - it 'shows the display value for the dropdown field' do - render :partial => "/shared/dialogs/dialog_field_drop_down_list.html.haml", :locals => {:edit => @edit, :field => @field} - expect(rendered).to eq("Desc2\n") - end - end -end