diff --git a/app/dashboards/agent_bot_dashboard.rb b/app/dashboards/agent_bot_dashboard.rb index 87605135d..e97a64de8 100644 --- a/app/dashboards/agent_bot_dashboard.rb +++ b/app/dashboards/agent_bot_dashboard.rb @@ -12,6 +12,7 @@ class AgentBotDashboard < Administrate::BaseDashboard avatar_url: AvatarField, id: Field::Number, name: Field::String, + account: Field::BelongsTo.with_options(searchable: true, searchable_field: 'name', order: 'id DESC'), description: Field::String, outgoing_url: Field::String, created_at: Field::DateTime, @@ -26,6 +27,7 @@ class AgentBotDashboard < Administrate::BaseDashboard COLLECTION_ATTRIBUTES = %i[ id avatar_url + account name outgoing_url ].freeze @@ -34,7 +36,7 @@ class AgentBotDashboard < Administrate::BaseDashboard # an array of attributes that will be displayed on the model's show page. SHOW_PAGE_ATTRIBUTES = %i[ id - avatar_url + account name description outgoing_url @@ -45,6 +47,7 @@ class AgentBotDashboard < Administrate::BaseDashboard # on the model's form (`new` and `edit`) pages. FORM_ATTRIBUTES = %i[ name + account description outgoing_url ].freeze diff --git a/app/fields/avatar_field.rb b/app/fields/avatar_field.rb index 50633ccd2..a9674eb94 100644 --- a/app/fields/avatar_field.rb +++ b/app/fields/avatar_field.rb @@ -2,6 +2,6 @@ require 'administrate/field/base' class AvatarField < Administrate::Field::Base def avatar_url - data.presence || '/admin/avatar.png' + data.presence&.gsub('?d=404', '?d=mp') end end diff --git a/app/models/platform_app_permissible.rb b/app/models/platform_app_permissible.rb index 14b804e84..94852dbac 100644 --- a/app/models/platform_app_permissible.rb +++ b/app/models/platform_app_permissible.rb @@ -16,11 +16,9 @@ # unique_permissibles_index (platform_app_id,permissible_id,permissible_type) UNIQUE # class PlatformAppPermissible < ApplicationRecord - include AccessTokenable - validates :platform_app, presence: true validates :platform_app_id, uniqueness: { scope: [:permissible_id, :permissible_type] } belongs_to :platform_app - belongs_to :permissible, polymorphic: true, dependent: :destroy_async + belongs_to :permissible, polymorphic: true end diff --git a/app/views/fields/avatar_field/_index.html.erb b/app/views/fields/avatar_field/_index.html.erb index 61f2eff47..408739ece 100644 --- a/app/views/fields/avatar_field/_index.html.erb +++ b/app/views/fields/avatar_field/_index.html.erb @@ -1 +1 @@ -<%= image_tag field.avatar_url %> +<%= image_tag field.avatar_url if field.avatar_url.present? %> diff --git a/app/views/fields/avatar_field/_show.html.erb b/app/views/fields/avatar_field/_show.html.erb index 61f2eff47..408739ece 100644 --- a/app/views/fields/avatar_field/_show.html.erb +++ b/app/views/fields/avatar_field/_show.html.erb @@ -1 +1 @@ -<%= image_tag field.avatar_url %> +<%= image_tag field.avatar_url if field.avatar_url.present? %> diff --git a/app/views/super_admin/application/_navigation.html.erb b/app/views/super_admin/application/_navigation.html.erb index d55927c86..fb4fd9018 100644 --- a/app/views/super_admin/application/_navigation.html.erb +++ b/app/views/super_admin/application/_navigation.html.erb @@ -17,7 +17,8 @@ as defined by the routes in the `admin/` namespace super_admins: 'ion ion-unlocked', access_tokens: 'ion-key', platform_apps: 'ion ion-social-buffer', - installation_configs: 'ion ion-settings' + installation_configs: 'ion ion-settings', + agent_bots: 'ion ion-social-android', } %> @@ -39,7 +40,7 @@ as defined by the routes in the `admin/` namespace <% Administrate::Namespace.new(namespace).resources.each do |resource| %> - <% next if ["account_users", "agent_bots", "dashboard", "devise/sessions", "app_configs" ].include? resource.resource %> + <% next if ["account_users", "dashboard", "devise/sessions", "app_configs" ].include? resource.resource %>
  • <%= link_to( diff --git a/app/views/super_admin/application/index.html.erb b/app/views/super_admin/application/index.html.erb index 951792711..43a3705de 100644 --- a/app/views/super_admin/application/index.html.erb +++ b/app/views/super_admin/application/index.html.erb @@ -62,5 +62,5 @@ It renders the `_table` partial to display details about the resources. table_title: "page-title" ) %> - <%= paginate resources %> + <%= paginate resources, param_name: '_page'%> diff --git a/app/views/super_admin/users/index.html.erb b/app/views/super_admin/users/index.html.erb deleted file mode 100644 index 951792711..000000000 --- a/app/views/super_admin/users/index.html.erb +++ /dev/null @@ -1,66 +0,0 @@ -<%# -# Index - -This view is the template for the index page. -It is responsible for rendering the search bar, header and pagination. -It renders the `_table` partial to display details about the resources. - -## Local variables: - -- `page`: - An instance of [Administrate::Page::Collection][1]. - Contains helper methods to help display a table, - and knows which attributes should be displayed in the resource's table. -- `resources`: - An instance of `ActiveRecord::Relation` containing the resources - that match the user's search criteria. - By default, these resources are passed to the table partial to be displayed. -- `search_term`: - A string containing the term the user has searched for, if any. -- `show_search_bar`: - A boolean that determines if the search bar should be shown. - -[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection -%> - -<% content_for(:title) do %> - <%= display_resource_name(page.resource_name) %> -<% end %> - - - -
    - <%= render( - "collection", - collection_presenter: page, - collection_field_name: resource_name, - page: page, - resources: resources, - table_title: "page-title" - ) %> - - <%= paginate resources %> -
    diff --git a/db/migrate/20220111223630_remove_platform_app_permissible_access_tokens.rb b/db/migrate/20220111223630_remove_platform_app_permissible_access_tokens.rb new file mode 100644 index 000000000..2afbde57e --- /dev/null +++ b/db/migrate/20220111223630_remove_platform_app_permissible_access_tokens.rb @@ -0,0 +1,5 @@ +class RemovePlatformAppPermissibleAccessTokens < ActiveRecord::Migration[6.1] + def change + AccessToken.where(owner_type: 'PlatformAppPermissible').destroy_all + end +end diff --git a/db/schema.rb b/db/schema.rb index 34bcdce36..53d72fe98 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_01_11_200105) do +ActiveRecord::Schema.define(version: 2022_01_11_223630) do # These are extensions that must be enabled in order to support this database enable_extension "pg_stat_statements" diff --git a/public/admin/avatar.png b/public/admin/avatar.png deleted file mode 100644 index a6c119079..000000000 Binary files a/public/admin/avatar.png and /dev/null differ diff --git a/public/admin/avatar_square.png b/public/admin/avatar_square.png deleted file mode 100644 index f9eb765c9..000000000 Binary files a/public/admin/avatar_square.png and /dev/null differ