Merge pull request #4254 from 3scale/THREESCALE-9869_tokens_page

🦋 Updates Tokens page

Author: josemigallas

app/controllers/provider/admin/user/access_tokens_controller.rb

@@ -11,9 +11,9 @@ class AccessTokensController < BaseController
         before_action :disable_client_cache
         before_action :load_access_token, only: %i[edit update destroy]
 
-        def index
-          @access_tokens = access_tokens
-        end
+        helper_method :access_tokens, :services_with_token
+
+        def index; end
 
         def new
           @presenter = AccessTokensNewPresenter.new(current_account)
@@ -60,6 +60,10 @@ def access_tokens
           @access_tokens ||= current_user.access_tokens
         end
 
+        def services_with_token
+          @services_with_token ||= current_user.decorate.accessible_services_with_token
+        end
+
         def load_access_token
           @access_token = access_tokens.find(params[:id])
         end

app/decorators/user_decorator.rb

@@ -14,4 +14,11 @@ def display_name
   def informal_name
     first_name.presence || last_name.presence || username
   end
+
+  def accessible_services_with_token
+    return Service.none unless has_permission?(:plans)
+
+    accessible_services.joins(:service_tokens)
+                       .includes(:service_tokens)
+  end
 end

app/helpers/buttons_helper.rb

@@ -83,6 +83,7 @@ def action_button_to(action, url, options = {})
     fancy_button_to(label, url, options)
   end
 
+  # DEPRECATED: Replace with form to be independent of rails-ujs (data-method: 'delete')
   # Button for deleting stuff.
   #
   # This is a shortcut for

app/helpers/patternfly_components_helper.rb

@@ -78,27 +78,20 @@ def pf_toast_alert(title, **options)
     end
   end
 
-  # TODO: this action button is used only in app/views/provider/admin/account/users/index.html.slim
-  # right now, but could be used in other tables. Eliminate existing repetition by using this helper
   def pf_delete_table_action(url, button_options = {})
-    form_attributes = { method: :delete }
-
-    button_class = 'pf-c-button pf-m-link pf-m-danger'
-
-    confirm = button_options.delete(:confirm) || 'It will be permanently delete. Are you sure?'
+    confirm = button_options.delete(:confirm) || I18n.t('shared.delete_button_confirm')
+    title = button_options.delete(:title) || I18n.t('shared.delete_button_title')
 
     button_attributes = { type: :submit,
-                          class: button_class.strip,
+                          class: 'pf-c-button pf-m-link pf-m-danger',
+                          title:,
                           'data-confirm': confirm }.merge(button_options)
 
-    span = tag.span class: 'pf-c-button__icon pf-m-start' do
-      tag.i class: "fas fa-trash", 'aria-hidden': 'true'
-    end
-    label = 'Delete'
-
-    form_tag(url, form_attributes) do
+    form_tag(url, method: :delete) do
       tag.button(**button_attributes) do
-        span + label
+        tag.span class: 'pf-c-button__icon pf-m-start' do
+          tag.i class: 'fas fa-trash', 'aria-hidden': 'true'
+        end
       end
     end
   end

app/javascript/packs/access_tokens.scss

@@ -1,3 +1,4 @@
+@import '~@patternfly/patternfly/components/ActionList/action-list.css';
 @import '~@patternfly/patternfly/components/Button/button.css';
 @import '~@patternfly/patternfly/components/Check/check.css';
 @import '~@patternfly/patternfly/components/Form/form.css';
@@ -8,3 +9,9 @@
     margin-top: var(--pf-c-check__body--MarginTop);
   }
 }
+
+.pf-c-form__actions {
+  .pf-c-button.pf-m-danger {
+    margin-left: auto;
+  }
+}

app/javascript/packs/pf_form.scss

@@ -14,8 +14,8 @@ def access_token
     end
 
     def service_tokens
-      tokens = @user.accessible_service_tokens.map do |service_token|
-        { name: service_token.service.name, value: service_token.value }
+      tokens = @user.decorate.accessible_services_with_token.map do |service|
+        { name: service.name, value: service.active_service_token.value }
       end
       tokens.presence || [{ name: "You don't have access to any services, contact an administrator of this account.", value: '' }]
     end

app/lib/api_docs/provider_user_data.rb

@@ -19,6 +19,11 @@ def output_html(field, options = {})
     typed_input_field.input(self, builder_options)
   end
 
+  def cancel_link(href, opts = {})
+    opts.reverse_merge!(class: 'pf-c-button pf-m-link', type: :button)
+    template.link_to(I18n.t('shared.cancel_button'), href, **opts)
+  end
+
   def commit_button(title, opts = {})
     raise ArgumentError, 'button_html prop will be ignored, use standard html attributes' if opts.key?(:button_html)
 

app/lib/fields/patternfly_form_builder.rb

@@ -45,7 +45,7 @@ def permission_name
   class Scopes
     extend Forwardable
 
-    delegate %i(each count select any? map) => :scopes
+    delegate %i[each empty? count select any? map] => :scopes
 
     def initialize(scopes)
       @scopes = scopes

app/models/access_token.rb

@@ -191,15 +191,6 @@ def allowed_access_token_scopes
     AccessToken.scopes.allowed_for(self)
   end
 
-  def accessible_service_tokens
-    if has_permission?(:plans)
-      accessible_services.joins(:service_tokens)
-        .includes(:service_tokens).map(&:active_service_token)
-    else
-      []
-    end
-  end
-
   def accessible_cinstances
     account.provided_cinstances.permitted_for(self)