Skip to content

Commit

Permalink
♻️ DRY Adds partial for Mapping Rules HTMLs (#2998)
Browse files Browse the repository at this point in the history
♻️ DRY Adds partial for Mapping Rules HTMLs
  • Loading branch information
lvillen committed Jun 23, 2022
1 parent 05b5d16 commit 3de7684
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
15 changes: 5 additions & 10 deletions app/views/api/proxy_rules/new.html.slim
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
h1 New Mapping Rule

div{ id="new-mapping-rule-form" data-url=admin_service_proxy_rules_path(@service)
data-http-methods=ProxyRule::ALLOWED_HTTP_METHODS
data-is-proxy-pro-enabled=@service.using_proxy_pro?
data-top-level-metrics=@service.top_level_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json
data-errors=@proxy_rule.errors.to_json
data-methods=@service.method_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json}
= javascript_pack_tag 'new_mapping_rule'

= render 'shared/new_mapping_rules', url: admin_service_proxy_rules_path(@service),
is_proxy_pro_enabled: @service.using_proxy_pro?,
top_level_metrics: @service.top_level_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json,
errors: @proxy_rule.errors.to_json,
methods: @service.method_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
h1 New Mapping Rule

div{ id="new-mapping-rule-form" data-url=provider_admin_backend_api_mapping_rules_path(@backend_api)
data-http-methods=ProxyRule::ALLOWED_HTTP_METHODS
data-top-level-metrics=@backend_api.top_level_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json
data-methods=@backend_api.method_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json}
= javascript_pack_tag 'new_mapping_rule'
= render 'shared/new_mapping_rules', url: provider_admin_backend_api_mapping_rules_path(@backend_api),
is_proxy_pro_enabled: nil,
top_level_metrics: @backend_api.top_level_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json,
errors: @proxy_rule.errors.to_json,
methods: @backend_api.method_metrics.reorder(updated_at: :desc).decorate.map(&:new_mapping_rule_data).to_json
9 changes: 9 additions & 0 deletions app/views/shared/_new_mapping_rules.html.slim
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
h1 New Mapping Rule

div{ id="new-mapping-rule-form" data-url=url
data-http-methods=ProxyRule::ALLOWED_HTTP_METHODS
data-is-proxy-pro-enabled=is_proxy_pro_enabled
data-top-level-metrics=top_level_metrics
data-errors=errors
data-methods=methods}
= javascript_pack_tag 'new_mapping_rule'

0 comments on commit 3de7684

Please sign in to comment.