diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 21384cb34a4cb9c4e03ca2b2585c9ab0057313fd..156272f3a0e6d97351c6ccdf74533791665501c3 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -23,6 +23,19 @@ class Admin::UsersController < Admin::ApplicationController
add_breadcrumb t('edit')
end
+ def favorite
+ operation = params[:operation]
+ id = params[:about_id]
+ type = params[:about_type]
+ about = type.constantize.find id
+ if operation == 'add'
+ current_user.add_favorite(about)
+ else
+ current_user.remove_favorite(about)
+ end
+ redirect_back fallback_location: [:admin, about]
+ end
+
def create
# we don't want the confirmation mail to be send when the user is created from admin!
@user.skip_confirmation!
diff --git a/app/models/user.rb b/app/models/user.rb
index ff0b669199c7a2ca053f67a7e8e717ea7fe8c402..93a6c8fbf7e71be9b40abfac8d44d575f28895a1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -61,6 +61,8 @@ class User < ApplicationRecord
include WithAdminTheme
include WithAuthorship
include WithAvatar
+ include WithFavorites
+ # FIXME y a-t-il des couplages temporels qui justifient l'ordre ci-dessous ?
include WithRegistrationContext
include WithUniversity
include WithAuthentication
diff --git a/app/models/user/favorite.rb b/app/models/user/favorite.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a92b1631091e3affdd3c76ef1304d094dbadba49
--- /dev/null
+++ b/app/models/user/favorite.rb
@@ -0,0 +1,24 @@
+# == Schema Information
+#
+# Table name: user_favorites
+#
+# id :uuid not null, primary key
+# about_type :string not null, indexed => [about_id]
+# created_at :datetime not null
+# updated_at :datetime not null
+# about_id :uuid not null, indexed => [about_type]
+# user_id :uuid not null, indexed
+#
+# Indexes
+#
+# index_user_favorites_on_about (about_type,about_id)
+# index_user_favorites_on_user_id (user_id)
+#
+# Foreign Keys
+#
+# fk_rails_25ed4cb388 (user_id => users.id)
+#
+class User::Favorite < ApplicationRecord
+ belongs_to :user
+ belongs_to :about, polymorphic: true
+end
diff --git a/app/models/user/with_favorites.rb b/app/models/user/with_favorites.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d5a71a3b244ba08a3d3e4eaf68972f83bfcbdf0a
--- /dev/null
+++ b/app/models/user/with_favorites.rb
@@ -0,0 +1,25 @@
+module User::WithFavorites
+ extend ActiveSupport::Concern
+
+ included do
+ has_many :favorites, dependent: :destroy
+ end
+
+ def add_favorite(about)
+ favorites_for(about).first_or_create
+ end
+
+ def remove_favorite(about)
+ favorites_for(about).destroy_all
+ end
+
+ def favorite?(about)
+ favorites_for(about).any?
+ end
+
+ protected
+
+ def favorites_for(about)
+ favorites.where(about_id: about.id, about_type: about.class.polymorphic_name)
+ end
+end
diff --git a/app/views/admin/application/favorites/_show.html.erb b/app/views/admin/application/favorites/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..98ebbb306fcd0f2566ddfbc69241b8e76c799157
--- /dev/null
+++ b/app/views/admin/application/favorites/_show.html.erb
@@ -0,0 +1,19 @@
+<h2 class="category"><%= User::Favorite.model_name.human(count: 2) %></h2>
+<div class="row">
+ <% if current_user.favorites.none? %>
+ <p><%= t 'user.favorites.none' %></p>
+ <% else %>
+ <% current_user.favorites.each do |favorite| %>
+ <% about = favorite.about %>
+ <% next unless can?(:read, about) %>
+ <div class="col-md-6 col-xl-4 d-flex">
+ <%= osuny_panel about do %>
+ <p class="small"><%= about.class.model_name.human %></p>
+ <%= link_to t('show'),
+ [:admin, about],
+ class: button_classes('stretched-link') %>
+ <% end %>
+ </div>
+ <% end %>
+ <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/application/favorites/_widget.html.erb b/app/views/admin/application/favorites/_widget.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..727d4b3ae7aa2e68e751f06cc87f60d6ab665413
--- /dev/null
+++ b/app/views/admin/application/favorites/_widget.html.erb
@@ -0,0 +1,22 @@
+<div>
+ <% if current_user.favorite?(about)%>
+ <%= link_to admin_favorite_path(
+ operation: :remove,
+ about_id: about.id,
+ about_type: about.class.polymorphic_name
+ ), method: :put do %>
+ <%= t 'user.favorites.remove' %>
+ <i class="fas fa-star"></i>
+ <% end %>
+
+ <% else %>
+ <%= link_to admin_favorite_path(
+ operation: :add,
+ about_id: about.id,
+ about_type: about.class.polymorphic_name
+ ), method: :put do %>
+ <%= t 'user.favorites.add' %>
+ <i class="fa-regular fa-star"></i>
+ <% end %>
+ <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/extranets/show.html.erb b/app/views/admin/communication/extranets/show.html.erb
index 829a978296d36554f2ce66c9e97c410a9734bdbd..121d8f60666e42b5fa6810e49258c476cc5ca583 100644
--- a/app/views/admin/communication/extranets/show.html.erb
+++ b/app/views/admin/communication/extranets/show.html.erb
@@ -8,6 +8,7 @@
<% if @extranet.about %>
(<%= link_to @extranet.about, [:admin, @extranet.about] unless @extranet.about.nil? %>)
<% end %>
+ <%= render 'admin/application/favorites/widget', about: @extranet %>
<% end %>
<%= render 'admin/communication/extranets/sidebar' do %>
diff --git a/app/views/admin/communication/websites/show.html.erb b/app/views/admin/communication/websites/show.html.erb
index 04543e484172bfef99ad86a914ce8a4cb4d54fa8..dcce07ed02e0f973f972339622fa6de10e6b8312 100644
--- a/app/views/admin/communication/websites/show.html.erb
+++ b/app/views/admin/communication/websites/show.html.erb
@@ -10,6 +10,7 @@
@website.about,
[:admin, @website.about] unless @website.about.nil? %>)
<% end %>
+ <%= render 'admin/application/favorites/widget', about: @website %>
<% end %>
<%= render 'admin/communication/websites/sidebar' do %>
diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
index e067d7978729903f04eda3bb49b8835ec5664efc..75054a62cf460c02e315caec123d6101ad3f9ecc 100644
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -36,52 +36,7 @@
</div>
</div>
-<% if current_university.communication_websites.any? && can?(:read, Communication::Website) %>
- <h2 class="category"><%= Communication::Website.model_name.human(count: 2) %></h2>
- <div class="row">
- <% current_university.communication_websites.each do |website| %>
- <% next unless can?(:read, website) %>
- <div class="<%= classes %>">
- <%= osuny_panel website,
- action: "<i class=\"#{ Icon::COMMUNICATION_WEBSITE }\"></i>" do %>
- <p class="small"><%= website.url %></p>
- <%= link_to t('show'), [:admin, website], class: button_classes('stretched-link') %>
- <% end %>
- </div>
- <% end %>
- </div>
-<% end %>
-
-<% if current_university.communication_extranets.any? && can?(:read, Communication::Extranet) %>
- <h2 class="category"><%= Communication::Extranet.model_name.human(count: 2) %></h2>
- <div class="row">
- <% current_university.communication_extranets.each do |extranet| %>
- <% next unless can?(:read, extranet) %>
- <div class="<%= classes %>">
- <%= osuny_panel extranet,
- action: "<i class=\"#{ Icon::COMMUNICATION_EXTRANET }\"></i>" do %>
- <p class="small"><%= extranet.url %></p>
- <%= link_to t('show'), [:admin, extranet], class: button_classes('stretched-link') %>
- <% end %>
- </div>
- <% end %>
- </div>
-<% end %>
-
-<% if current_university.research_journals.any? && can?(:read, Research::Journal) %>
- <h2 class="category"><%= Research::Journal.model_name.human(count: 2) %></h2>
- <div class="row pure__row--small">
- <% current_university.research_journals.each do |journal| %>
- <% next unless can?(:read, journal) %>
- <div class="<%= classes %>">
- <%= osuny_panel journal,
- action: "<i class=\"#{ Icon::RESEARCH_JOURNAL }\"></i>" do %>
- <%= link_to t('show'), [:admin, journal], class: button_classes('stretched-link') %>
- <% end %>
- </div>
- <% end %>
- </div>
-<% end %>
+<%= render 'admin/application/favorites/show' %>
<div class="row mt-5 pt-5">
<% @namespaces.each do |namespace| %>
diff --git a/app/views/admin/research/journals/show.html.erb b/app/views/admin/research/journals/show.html.erb
index d6b9c07bfd938eb323405a644fbf15fe570c3d39..f987790e60a85d1a2061ec7105ab198546675072 100644
--- a/app/views/admin/research/journals/show.html.erb
+++ b/app/views/admin/research/journals/show.html.erb
@@ -9,6 +9,7 @@
<% end %>
<% end %>
<% if @journal.issn %><%= Research::Journal.human_attribute_name('issn') %> <%= @journal.issn %><% end %>
+ <%= render 'admin/application/favorites/widget', about: @journal %>
<% end %>
<%= render 'admin/research/journals/sidebar' do %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dc883cd4684e38de51169e7ca3d9e5b96312b53b..04fd72e9aef54b276bcea3524f73d6114d39298f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -93,6 +93,9 @@ en:
user:
one: User
other: Users
+ user/favorite:
+ one: Favorite
+ other: Favorites
add: Add
add_field: Add field
admin:
@@ -306,6 +309,11 @@ en:
date_with_hour: "%B %d, %Y %H:%M"
today: Today
true: Yes
+ user:
+ favorites:
+ add: Add to favorites
+ remove: Remove from favorites
+ none: You have no favorites yet. Feel free to add the websites, extranets or journals you often work on!
photo_import:
next: Next image
nothing: No results for this search
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 71d597e29f33d503c81c6f1da24184e23de6d567..0a3513e105ed8c9027da31c463d2371a629aba8e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -93,6 +93,9 @@ fr:
user:
one: Utilisateur·rice
other: Utilisateur·rice·s
+ user/favorite:
+ one: Favori
+ other: Favoris
add: Ajouter
add_field: Ajouter un champ
admin:
@@ -306,6 +309,11 @@ fr:
date_with_hour: "%d %B %Y %H:%M"
today: Aujourd'hui
true: Oui
+ user:
+ favorites:
+ add: Ajouter aux favoris
+ remove: Enlever des favoris
+ none: Vous n'avez pas encore de favoris, n'hésitez pas à ajouter les sites Web, extranets ou revues scientifiques auxquels vous accédez fréquemment !
photo_import:
next: Images suivantes
nothing: Aucun résultat pour cette recherche
diff --git a/config/routes.rb b/config/routes.rb
index cc81e0d31ff58eefaaca592ada11568e94fd4a37..2d75270688eb81113da9f1ed8be79b6339f6a388 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,6 +24,7 @@ Rails.application.routes.draw do
patch 'unlock' => 'users#unlock', on: :member
end
put 'theme' => 'application#set_theme', as: :set_theme
+ put 'favorite' => 'users#favorite', as: :favorite
draw 'admin/administration'
draw 'admin/communication'
draw 'admin/education'
diff --git a/db/migrate/20230614062545_create_user_favorites.rb b/db/migrate/20230614062545_create_user_favorites.rb
new file mode 100644
index 0000000000000000000000000000000000000000..778eba0cb820d5213437cfb6d39667f4d4d13e79
--- /dev/null
+++ b/db/migrate/20230614062545_create_user_favorites.rb
@@ -0,0 +1,10 @@
+class CreateUserFavorites < ActiveRecord::Migration[7.0]
+ def change
+ create_table :user_favorites, id: :uuid do |t|
+ t.references :user, null: false, foreign_key: true, type: :uuid
+ t.references :about, polymorphic: true, null: false, type: :uuid
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e3afd6e4f54f62e0164732df4d92823c7c308b7f..e4fe4db68c63e33e43d5f4b835d904648853e699 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[7.0].define(version: 2023_06_05_080634) do
+ActiveRecord::Schema[7.0].define(version: 2023_06_14_062545) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -1048,6 +1048,16 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_05_080634) do
t.index ["university_id"], name: "index_university_roles_on_university_id"
end
+ create_table "user_favorites", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ t.uuid "user_id", null: false
+ t.string "about_type", null: false
+ t.uuid "about_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["about_type", "about_id"], name: "index_user_favorites_on_about"
+ t.index ["user_id"], name: "index_user_favorites_on_user_id"
+ end
+
create_table "users", id: :uuid, default: -> { "public.gen_random_uuid()" }, force: :cascade do |t|
t.uuid "university_id", null: false
t.string "first_name"
@@ -1214,6 +1224,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_06_05_080634) do
add_foreign_key "university_person_involvements", "universities"
add_foreign_key "university_person_involvements", "university_people", column: "person_id"
add_foreign_key "university_roles", "universities"
+ add_foreign_key "user_favorites", "users"
add_foreign_key "users", "languages"
add_foreign_key "users", "universities"
end
diff --git a/test/fixtures/user/favorites.yml b/test/fixtures/user/favorites.yml
new file mode 100644
index 0000000000000000000000000000000000000000..35d99a85f9237a456a88a5ac9344982b1d80abe6
--- /dev/null
+++ b/test/fixtures/user/favorites.yml
@@ -0,0 +1,31 @@
+# == Schema Information
+#
+# Table name: user_favorites
+#
+# id :uuid not null, primary key
+# about_type :string not null, indexed => [about_id]
+# created_at :datetime not null
+# updated_at :datetime not null
+# about_id :uuid not null, indexed => [about_type]
+# user_id :uuid not null, indexed
+#
+# Indexes
+#
+# index_user_favorites_on_about (about_type,about_id)
+# index_user_favorites_on_user_id (user_id)
+#
+# Foreign Keys
+#
+# fk_rails_25ed4cb388 (user_id => users.id)
+#
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ user: one
+ about: one
+ about_type: About
+
+two:
+ user: two
+ about: two
+ about_type: About
diff --git a/test/models/user/favorite_test.rb b/test/models/user/favorite_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a1cc949faf90dd585b31796ad8b578cc4af35d8a
--- /dev/null
+++ b/test/models/user/favorite_test.rb
@@ -0,0 +1,27 @@
+# == Schema Information
+#
+# Table name: user_favorites
+#
+# id :uuid not null, primary key
+# about_type :string not null, indexed => [about_id]
+# created_at :datetime not null
+# updated_at :datetime not null
+# about_id :uuid not null, indexed => [about_type]
+# user_id :uuid not null, indexed
+#
+# Indexes
+#
+# index_user_favorites_on_about (about_type,about_id)
+# index_user_favorites_on_user_id (user_id)
+#
+# Foreign Keys
+#
+# fk_rails_25ed4cb388 (user_id => users.id)
+#
+require "test_helper"
+
+class User::FavoriteTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end