decidim-admin 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d6185dd125a2294268f3ecd81a04bda650cd19
-  data.tar.gz: 7285fb73b6dc707318b4aa7e6521361bc3324e8a
+  metadata.gz: 43ab0a410b437196f1663001c22cf03810aed689
+  data.tar.gz: 9b110d4bc37e0483b6e6c9756448701115261fb8
 SHA512:
-  metadata.gz: 3ea15149f26cb7988fd7493bd77f194b7a2eb7b2b52dfa8b1d77f68e9390a5a601ef37301d5694827fa90f93ef77b66161e245c6c7568209dbb9016053647213
-  data.tar.gz: 3b828b9ce5ba8de78d7340c1272f7fddace5f5221a2ce0c4f99369ba9338a7e12d9ff21dde3fc6300abc06b41e4a8b73b73fa3a45f4f64f4222a1c279e50c7c7
+  metadata.gz: 9abf94828b7d759eb50dbb978b7d53c6262c7f37dd78f18d4ad64cca1513c5ca8433d3acd6a75bb8839b49a945e3f88b363522e7a7e91e322d570299240f71f1
+  data.tar.gz: f45d28ff90b26b40234b2a4371d90e30ae7c900171a8278fc08d30e595996458d45fb45f680313b84ac2c05a3eadd4c5d7d67e8630ace71ee5828aa0cefe6b6c

data/Rakefile

@@ -1,2 +1,2 @@
 # frozen_string_literal: true
-require "decidim/common_rake"
+require "decidim/dev/common_rake"

data/app/assets/javascripts/decidim/admin/application.js.es6

@@ -16,4 +16,3 @@ const pageLoad = () => {
 };
 
 $(document).on('turbolinks:load', pageLoad);
-$(pageLoad);

data/app/assets/stylesheets/decidim/admin/_foundation_and_overrides.scss

@@ -22,6 +22,7 @@
 @include foundation-breadcrumbs;
 @include foundation-button-group;
 @include foundation-callout;
+@include foundation-card;
 @include foundation-close-button;
 @include foundation-drilldown-menu;
 @include foundation-dropdown;

data/app/assets/stylesheets/decidim/admin/_icons.scss

@@ -0,0 +1,9 @@
+.icon{
+  height: 0.8em;
+  width: 0.8em;
+  display: inline;
+  vertical-align: middle;
+  fill: currentColor;
+  margin-left: .1rem;
+  margin-right: .1rem;
+}

data/app/assets/stylesheets/decidim/admin/application.scss

@@ -5,6 +5,7 @@
 @import "tables";
 @import "actions";
 @import "forms";
+@import "icons";
 
 @import "decidim/editor";
 @import "decidim/utils/fontface";

data/app/commands/decidim/admin/create_feature.rb

@@ -36,7 +36,9 @@ module Decidim
         @feature = Feature.create!(
           manifest_name: manifest.name,
           name: form.name,
-          participatory_process: participatory_process
+          participatory_process: participatory_process,
+          settings: @form.settings,
+          step_settings: form.step_settings
         )
       end
 

data/app/commands/decidim/admin/create_participatory_process.rb

@@ -20,8 +20,8 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        create_participatory_process
-        broadcast(:ok)
+        process = create_participatory_process
+        broadcast(:ok, process)
       end
 
       private
@@ -29,18 +29,30 @@ module Decidim
       attr_reader :form
 
       def create_participatory_process
-        ParticipatoryProcess.create!(
-          title: form.title,
-          subtitle: form.subtitle,
-          slug: form.slug,
-          hashtag: form.hashtag,
-          description: form.description,
-          short_description: form.short_description,
-          hero_image: form.hero_image,
-          banner_image: form.banner_image,
-          promoted: form.promoted,
-          organization: form.current_organization
-        )
+        transaction do
+          process = ParticipatoryProcess.create!(
+            title: form.title,
+            subtitle: form.subtitle,
+            slug: form.slug,
+            hashtag: form.hashtag,
+            description: form.description,
+            short_description: form.short_description,
+            hero_image: form.hero_image,
+            banner_image: form.banner_image,
+            promoted: form.promoted,
+            organization: form.current_organization
+          )
+
+          process.steps.create!(
+            title: TranslationsHelper.multi_translation(
+              "decidim.admin.participatory_process_steps.default_title",
+              form.current_organization.available_locales
+            ),
+            active: true
+          )
+
+          process
+        end
       end
     end
   end

data/app/commands/decidim/admin/destroy_feature.rb

@@ -26,11 +26,16 @@ module Decidim
 
       def destroy_feature
         transaction do
+          run_before_hooks
           @feature.destroy!
           run_hooks
         end
       end
 
+      def run_before_hooks
+        @feature.manifest.run_hooks(:before_destroy, @feature)
+      end
+
       def run_hooks
         @feature.manifest.run_hooks(:destroy, @feature)
       end

data/app/commands/decidim/admin/destroy_participatory_process_step.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command that sets all steps in a participatory process as inactive
+    class DestroyParticipatoryProcessStep < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # step - A ParticipatoryProcessStep that will be deactivated
+      def initialize(step)
+        @step = step
+        @participatory_process = step.participatory_process
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the data wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid, :last_step) if @participatory_process.steps.count == 1
+        return broadcast(:invalid, :active_step) if @step.active?
+
+        @step.destroy!
+        broadcast(:ok)
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/update_feature.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # This command gets called when a feature is created from the admin panel.
+    class UpdateFeature < Rectify::Command
+      attr_reader :form, :feature
+
+      # Public: Initializes the command.
+      #
+      # form    - The form from which the data in this feature comes from.
+      # feature - The feature to update.
+      def initialize(form, feature)
+        @manifest = feature.manifest
+        @form = form
+        @feature = feature
+      end
+
+      # Public: Creates the Feature.
+      #
+      # Broadcasts :ok if created, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          update_feature
+          run_hooks
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      def update_feature
+        @feature.update_attributes(
+          name: form.name,
+          settings: form.settings,
+          step_settings: form.step_settings
+        )
+      end
+
+      def run_hooks
+        @manifest.run_hooks(:update, @feature)
+      end
+    end
+  end
+end

data/app/commands/decidim/admin/update_organization.rb

@@ -37,11 +37,13 @@ module Decidim
       def attributes
         {
           name: form.name,
+          twitter_handler: form.twitter_handler,
           description: form.description,
           welcome_text: form.welcome_text,
           homepage_image: form.homepage_image || organization.homepage_image,
           logo: form.logo || organization.logo,
-          default_locale: form.default_locale
+          default_locale: form.default_locale,
+          show_statistics: form.show_statistics
         }
       end
     end

data/app/controllers/decidim/admin/features_controller.rb

@@ -20,7 +20,13 @@ module Decidim
       def new
         authorize! :create, Feature
 
-        @form = form(FeatureForm).instance(name: default_name(manifest))
+        @feature = Feature.new(
+          name: default_name(manifest),
+          manifest_name: params[:type],
+          participatory_process: participatory_process
+        )
+
+        @form = form(FeatureForm).from_model(@feature)
       end
 
       def create
@@ -40,8 +46,33 @@ module Decidim
         end
       end
 
+      def edit
+        @feature = query_scope.find(params[:id])
+        authorize! :update, @feature
+
+        @form = form(FeatureForm).from_model(@feature)
+      end
+
+      def update
+        @feature = query_scope.find(params[:id])
+        @form = form(FeatureForm).from_params(params)
+        authorize! :update, @feature
+
+        UpdateFeature.call(@form, @feature) do
+          on(:ok) do
+            flash[:notice] = I18n.t("features.update.success", scope: "decidim.admin")
+            redirect_to action: :index
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("features.update.error", scope: "decidim.admin")
+            render action: "new"
+          end
+        end
+      end
+
       def destroy
-        @feature = participatory_process.features.find(params[:id])
+        @feature = query_scope.find(params[:id])
         authorize! :destroy, @feature
 
         DestroyFeature.call(@feature) do
@@ -59,6 +90,10 @@ module Decidim
 
       private
 
+      def query_scope
+        participatory_process.features
+      end
+
       def manifest
         Decidim.find_feature_manifest(params[:type])
       end

data/app/controllers/decidim/admin/participatory_process_step_activations_controller.rb

@@ -24,22 +24,6 @@ module Decidim
         end
       end
 
-      def destroy
-        authorize! :deactivate, process_step
-
-        DeactivateParticipatoryProcessStep.call(process_step) do
-          on(:ok) do
-            flash[:notice] = I18n.t("participatory_process_step_activations.destroy.success", scope: "decidim.admin")
-          end
-
-          on(:invalid) do
-            flash.now[:alert] = I18n.t("participatory_process_step_activations.destroy.error", scope: "decidim.admin")
-          end
-
-          redirect_to participatory_process_steps_path(participatory_process)
-        end
-      end
-
       private
 
       def process_step

data/app/controllers/decidim/admin/participatory_process_steps_controller.rb

@@ -66,11 +66,18 @@ module Decidim
       def destroy
         @participatory_process_step = collection.find(params[:id])
         authorize! :destroy, @participatory_process_step
-        @participatory_process_step.destroy!
 
-        flash[:notice] = I18n.t("participatory_process_steps.destroy.success", scope: "decidim.admin")
+        DestroyParticipatoryProcessStep.call(@participatory_process_step) do
+          on(:ok) do
+            flash[:notice] = I18n.t("participatory_process_steps.destroy.success", scope: "decidim.admin")
+            redirect_to participatory_process_steps_path(participatory_process)
+          end
 
-        redirect_to participatory_process_steps_path(@participatory_process_step.participatory_process)
+          on(:invalid) do |reason|
+            flash[:alert] = I18n.t("participatory_process_steps.destroy.error.#{reason}", scope: "decidim.admin")
+            redirect_to participatory_process_steps_path(participatory_process)
+          end
+        end
       end
 
       private

data/app/controllers/decidim/admin/static_pages_controller.rb

@@ -13,12 +13,12 @@ module Decidim
 
       def new
         authorize! :new, StaticPage
-        @form = StaticPageForm.new
+        @form = form(StaticPageForm).instance
       end
 
       def create
         authorize! :new, StaticPage
-        @form = StaticPageForm.from_params(form_params)
+        @form = form(StaticPageForm).from_params(form_params)
 
         CreateStaticPage.call(@form) do
           on(:ok) do
@@ -35,13 +35,13 @@ module Decidim
 
       def edit
         authorize! :update, page
-        @form = StaticPageForm.from_model(page)
+        @form = form(StaticPageForm).from_model(page)
       end
 
       def update
         @page = collection.find(params[:id])
         authorize! :update, page
-        @form = StaticPageForm.from_params(form_params)
+        @form = form(StaticPageForm).from_params(form_params)
 
         UpdateStaticPage.call(page, @form) do
           on(:ok) do

data/app/controllers/decidim/admin/user_groups_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Controller that allows managing user groups at the admin panel.
+    #
+    class UserGroupsController < ApplicationController
+      def index
+        authorize! :index, UserGroup
+        @user_groups = collection
+      end
+
+      def verify
+        @user_group = collection.find(params[:id])
+        authorize! :verify, @user_group
+
+        @user_group.verify!
+
+        flash[:notice] = I18n.t("user_groups.verify.success", scope: "decidim.admin")
+        redirect_to decidim_admin.user_groups_path
+      end
+
+      private
+
+      def collection
+        UserGroup
+          .includes(:memberships)
+          .where(decidim_user_group_memberships: { decidim_user_id: current_organization.users })
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/users_controller.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+require_dependency "decidim/admin/application_controller"
+
+module Decidim
+  module Admin
+    # Controller that allows managing all admins at the admin panel.
+    #
+    class UsersController < Admin::ApplicationController
+      def index
+        authorize! :index, User
+        @users = collection
+      end
+
+      def new
+        authorize! :new, User
+        @form = form(InviteAdminForm).instance
+      end
+
+      def create
+        authorize! :new, User
+
+        default_params = {
+          organization: current_organization,
+          invitation_instructions: "invite_admin",
+          roles: %w(admin),
+          invited_by: current_user
+        }
+
+        @form = form(InviteAdminForm).from_params(params.merge(default_params))
+
+        InviteUser.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("users.create.success", scope: "decidim.admin")
+            redirect_to users_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("users.create.error", scope: "decidim.admin")
+            render :new
+          end
+        end
+      end
+
+      def resend_invitation
+        authorize! :invite, user
+
+        InviteUserAgain.call(user, "invite_admin") do
+          on(:ok) do
+            flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
+          end
+        end
+
+        redirect_to users_path
+      end
+
+      def destroy
+        authorize! :destroy, user
+
+        RemoveUserRole.call(user, "admin") do
+          on(:ok) do
+            flash[:notice] = I18n.t("users.destroy.success", scope: "decidim.admin")
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("users.destroy.error", scope: "decidim.admin")
+          end
+        end
+
+        redirect_to users_path
+      end
+
+      private
+
+      def user
+        @user ||= collection.find(params[:id])
+      end
+
+      def collection
+        @collection ||= current_organization.admins
+      end
+    end
+  end
+end

data/app/forms/decidim/admin/category_form.rb

@@ -13,15 +13,9 @@ module Decidim
       mimic :category
 
       validates :name, :description, translatable_presence: true
-      validates :current_process, presence: true
       validates :parent_id, inclusion: { in: :parent_categories_ids }, allow_blank: true
 
-      attr_reader :current_process
-
-      def initialize(attributes = {})
-        @current_process = attributes.delete("current_process") || attributes.delete(:current_process)
-        super
-      end
+      delegate :current_process, to: :context, prefix: false
 
       def parent_categories
         @parent_categories ||= current_process.categories.first_class.where.not(id: id)

data/app/forms/decidim/admin/feature_form.rb

@@ -11,6 +11,32 @@ module Decidim
 
       translatable_attribute :name, String
       validates :name, translatable_presence: true
+
+      attribute :settings, Object
+      attribute :manifest
+
+      attribute :step_settings, Hash[String => Object]
+      attribute :participatory_process
+
+      def map_model(model)
+        self.attributes = model.attributes
+        self.settings = model.settings
+      end
+
+      def settings?
+        settings.manifest.attributes.any?
+      end
+
+      def step_settings?
+        return false unless participatory_process.steps.any?
+
+        step_settings
+          .values
+          .map(&:manifest)
+          .flat_map(&:attributes)
+          .flat_map(&:keys)
+          .any?
+      end
     end
   end
 end

data/app/forms/decidim/admin/organization_form.rb

@@ -10,9 +10,11 @@ module Decidim
       mimic :organization
 
       attribute :name, String
+      attribute :twitter_handler, String
       attribute :default_locale, String
       attribute :homepage_image
       attribute :logo
+      attribute :show_statistics
 
       translatable_attribute :description, String
       translatable_attribute :welcome_text, String

data/app/forms/decidim/admin/participatory_process_step_form.rb

@@ -16,7 +16,7 @@ module Decidim
       attribute :start_date, DateTime
       attribute :end_date, DateTime
 
-      validates :title, :description, :short_description, translatable_presence: true
+      validates :title, translatable_presence: true
 
       validates :start_date, date: { before: :end_date, allow_blank: true, if: proc { |obj| obj.end_date.present? } }
       validates :end_date, date: { after: :start_date, allow_blank: true, if: proc { |obj| obj.start_date.present? } }

data/app/forms/decidim/admin/static_page_form.rb

@@ -6,17 +6,16 @@ module Decidim
       include TranslatableAttributes
 
       attribute :slug, String
-      attribute :organization, Decidim::Organization
       translatable_attribute :title, String
       translatable_attribute :content, String
 
       mimic :static_page
 
-      validates :slug, :organization, presence: true
+      validates :slug, presence: true
       validates :title, :content, translatable_presence: true
       validate :slug, :slug_uniqueness
 
-      alias current_organization organization
+      alias organization current_organization
 
       private
 

data/app/models/decidim/admin/abilities/admin_user.rb

@@ -27,6 +27,12 @@ module Decidim
           can :read, :admin_dashboard
           can :manage, ParticipatoryProcessAttachment
           can :manage, Scope
+          can [:create, :index, :new, :read, :invite], User
+          can [:destroy], [User] do |user_to_destroy|
+            user != user_to_destroy
+          end
+
+          can [:index, :verify], UserGroup
         end
       end
     end

data/app/views/decidim/admin/features/_feature.html.erb

@@ -2,6 +2,7 @@
   <td>
     <%= link_to decidim.feature_path(participatory_process, feature), target: "_blank" do %>
       <%= translated_attribute feature.name %>
+      <%= icon "external-link" %>
     <% end %>
   </td>
   <td>
@@ -11,10 +12,12 @@
 
     <% if feature.manifest.admin_engine %>
       <%= link_to manage_feature_path(participatory_process, feature), class: "button small" do %>
-        <%= t "actions.configure", scope: "decidim.admin" %>
+        <%= t "actions.manage", scope: "decidim.admin" %>
       <% end %>
     <% end %>
 
+    <%= link_to t("actions.configure", scope: "decidim.admin"), url_for(action: :edit, id: feature, controller: "features"), class: "small button" if can? :update, feature %>
+
     <%= link_to t("actions.destroy", scope: "decidim.admin"), url_for(action: :destroy, id: feature, controller: "features"), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, feature %>
   </td>
 </tr>

data/app/views/decidim/admin/features/_form.html.erb

@@ -1,3 +1,52 @@
 <div class="field">
   <%= form.translated :text_field, :name, autofocus: true %>
+
+  <% if form.object.settings? %>
+    <fieldset class="global-settings">
+      <div class="card">
+        <div class="card-divider">
+          <legend><%= t ".global_settings" %></legend>
+        </div>
+        <div class="card-section">
+          <%= form.fields_for :settings, form.object.settings do |settings_fields| %>
+            <%= render partial: "decidim/admin/features/settings_fields",
+                       locals: {
+                         form: settings_fields,
+                         feature: @feature,
+                         settings_name: "global"
+                       } %>
+          <% end %>
+        </div>
+      </div>
+    </fieldset>
+  <% end %>
+
+  <% if form.object.step_settings? %>
+    <fieldset class="step-settings">
+      <div class="card">
+        <div class="card-divider">
+          <legend><%= t ".step_settings" %></legend>
+        </div>
+        <div class="card-section">
+          <% participatory_process.steps.each do |step| %>
+            <fieldset class="step-settings-<%= step.id %>">
+              <legend><%= step.position + 1 %>. <%= translated_attribute step.title %></legend>
+              <% step_settings = form.object.step_settings[step.id.to_s] %>
+
+              <%= form.fields_for "step_settings", nil do |settings_fields| %>
+                <%= settings_fields.fields_for step.id.to_s, step_settings do |settings_fields| %>
+                  <%= render partial: "decidim/admin/features/settings_fields",
+                  locals: {
+                    form: settings_fields,
+                    feature: feature,
+                    settings_name: "step"
+                  } %>
+                <% end %>
+              <% end %>
+            </fieldset>
+          <% end %>
+        </div>
+      </div>
+    </fieldset>
+  <% end %>
 </div>