decidim-admin 0.26.2 → 0.27.0.rc2

data/lib/decidim/admin/test/forms/category_form_examples.rb

@@ -21,13 +21,6 @@ module Decidim
           ca: "Nom"
         }
       end
-      let(:description) do
-        {
-          en: "Description",
-          es: "Descripción",
-          ca: "Descripció"
-        }
-      end
       let(:parent_id) { nil }
       let(:attributes) do
         {
@@ -35,10 +28,7 @@ module Decidim
             "name_en" => name[:en],
             "name_es" => name[:es],
             "name_ca" => name[:ca],
-            "parent_id" => parent_id,
-            "description_en" => description[:en],
-            "description_es" => description[:es],
-            "description_ca" => description[:ca]
+            "parent_id" => parent_id
           }
         }
       end
@@ -59,16 +49,6 @@ module Decidim
         it { is_expected.to be_invalid }
       end
 
-      context "when some language in description is missing" do
-        let(:description) do
-          {
-            ca: "Descripció"
-          }
-        end
-
-        it { is_expected.to be_invalid }
-      end
-
       context "when the parent_id is set" do
         let!(:category) { create :category, participatory_space: participatory_space }
 

data/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -48,8 +48,11 @@ shared_examples "manage attachments examples" do
           es: "Este documento contiene información importante",
           ca: "Aquest document conté informació important"
         )
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
 
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      within ".new_attachment" do
         find("*[type=submit]").click
       end
 
@@ -81,7 +84,11 @@ shared_examples "manage attachments examples" do
         )
 
         select translated(attachment_collection.name, locale: :en), from: "attachment_attachment_collection_id"
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
+
+      within ".new_attachment" do
         find("*[type=submit]").click
       end
 

data/lib/decidim/admin/test/manage_categories_examples.rb

@@ -14,9 +14,6 @@ shared_examples "manage categories examples" do
 
     expect(page).to have_selector("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
     expect(page).to have_selector("input#category_weight[value='#{category.weight}']")
-    within ".editor .editor-container" do
-      expect(page).to have_content(strip_tags(translated(category.description, locale: :en)))
-    end
 
     expect(page).to have_selector("select#category_parent_id")
   end
@@ -32,13 +29,6 @@ shared_examples "manage categories examples" do
         es: "Mi categoría",
         ca: "La meva categoria"
       )
-      fill_in_i18n_editor(
-        :category_description,
-        "#category-description-tabs",
-        en: "Description",
-        es: "Descripción",
-        ca: "Descripció"
-      )
 
       find("*[type=submit]").click
     end

data/lib/decidim/admin/test/manage_component_permissions_examples.rb

@@ -52,9 +52,7 @@ shared_examples "Managing component permissions" do
 
   context "when failing to set permissions" do
     before do
-      # rubocop:disable RSpec/AnyInstance
       allow_any_instance_of(Decidim::Admin::PermissionsForm).to receive(:valid?).and_return(false)
-      # rubocop:enable RSpec/AnyInstance
       within ".component-#{component.id}" do
         click_link "Permissions"
       end

data/lib/decidim/admin/test/manage_moderations_examples.rb

@@ -1,5 +1,31 @@
 # frozen_string_literal: true
 
+shared_examples "sorted moderations" do
+  let!(:moderations) do
+    reportables.first(reportables.length - 1).map do |reportable|
+      moderation = create(:moderation, reportable: reportable, report_count: 1, reported_content: reportable.reported_searchable_content_text)
+      create(:report, moderation: moderation)
+      moderation
+    end
+  end
+  let!(:moderation) { moderations.first }
+  let(:moderations_link_text) { "Moderations" }
+
+  before do
+    visit participatory_space_path
+    click_link moderations_link_text
+  end
+
+  it "sorts the most recent first" do
+    within ".pagination" do
+      click_link "Last"
+    end
+    all("tbody tr").each_with_index do |row, _index|
+      expect(row.find("td:first-child")).to have_content(reportables.first.id)
+    end
+  end
+end
+
 shared_examples "manage moderations" do
   let!(:moderations) do
     reportables.first(reportables.length - 1).map do |reportable|

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.26.2"
+      "0.27.0.rc2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -88,28 +88,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc2
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -121,6 +121,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/cells/decidim/admin/attachments_privacy_warning/show.erb
+- app/cells/decidim/admin/attachments_privacy_warning_cell.rb
 - app/cells/decidim/admin/content_block/show.erb
 - app/cells/decidim/admin/content_block_cell.rb
 - app/cells/decidim/admin/results_per_page/show.erb
@@ -243,6 +245,7 @@ files:
 - app/controllers/decidim/admin/organization_external_domain_whitelist_controller.rb
 - app/controllers/decidim/admin/organization_homepage_content_blocks_controller.rb
 - app/controllers/decidim/admin/organization_homepage_controller.rb
+- app/controllers/decidim/admin/reminders_controller.rb
 - app/controllers/decidim/admin/resource_permissions_controller.rb
 - app/controllers/decidim/admin/scope_types_controller.rb
 - app/controllers/decidim/admin/scopes_controller.rb
@@ -303,6 +306,7 @@ files:
 - app/helpers/decidim/admin/moderations_helper.rb
 - app/helpers/decidim/admin/newsletters_helper.rb
 - app/helpers/decidim/admin/paginable/per_page_helper.rb
+- app/helpers/decidim/admin/reminders_helper.rb
 - app/helpers/decidim/admin/resource_permissions_helper.rb
 - app/helpers/decidim/admin/resource_scope_helper.rb
 - app/helpers/decidim/admin/scopes_helper.rb
@@ -320,11 +324,10 @@ files:
 - app/models/decidim/admin/fake_newsletter.rb
 - app/packs/entrypoints/decidim_admin.js
 - app/packs/entrypoints/decidim_admin.scss
+- app/packs/src/decidim/admin/admin_autocomplete.js
 - app/packs/src/decidim/admin/application.js
 - app/packs/src/decidim/admin/auto_buttons_by_position.component.js
 - app/packs/src/decidim/admin/auto_label_by_position.component.js
-- app/packs/src/decidim/admin/autocomplete.component.js
-- app/packs/src/decidim/admin/autocomplete.component.test.js
 - app/packs/src/decidim/admin/budget_rule_toggler.component.js
 - app/packs/src/decidim/admin/choose_language.js
 - app/packs/src/decidim/admin/draggable-list.js
@@ -351,7 +354,6 @@ files:
 - app/packs/stylesheets/decidim/admin/application.scss
 - app/packs/stylesheets/decidim/admin/bundle.scss
 - app/packs/stylesheets/decidim/admin/components/_accordion.scss
-- app/packs/stylesheets/decidim/admin/components/_autocomplete_select.component.scss
 - app/packs/stylesheets/decidim/admin/components/_dropdown-menu.scss
 - app/packs/stylesheets/decidim/admin/components/_sortable.scss
 - app/packs/stylesheets/decidim/admin/extra/_action-icon.scss
@@ -373,6 +375,7 @@ files:
 - app/packs/stylesheets/decidim/admin/extra/_title_bar.scss
 - app/packs/stylesheets/decidim/admin/modules/_action-icon.scss
 - app/packs/stylesheets/decidim/admin/modules/_agenda.scss
+- app/packs/stylesheets/decidim/admin/modules/_autocomplete.scss
 - app/packs/stylesheets/decidim/admin/modules/_buttons.scss
 - app/packs/stylesheets/decidim/admin/modules/_callouts.scss
 - app/packs/stylesheets/decidim/admin/modules/_card-grid.scss
@@ -398,6 +401,7 @@ files:
 - app/packs/stylesheets/decidim/admin/modules/_tabs.scss
 - app/packs/stylesheets/decidim/admin/modules/_title-bar.scss
 - app/packs/stylesheets/decidim/admin/modules/_typography.scss
+- app/packs/stylesheets/decidim/admin/modules/_upload_modal.scss
 - app/packs/stylesheets/decidim/admin/modules/_user-login.scss
 - app/packs/stylesheets/decidim/admin/modules/_users_statistics.scss
 - app/packs/stylesheets/decidim/admin/plugins/_foundation-datepicker.scss
@@ -529,6 +533,7 @@ files:
 - app/views/decidim/admin/participatory_space_private_users/index.html.erb
 - app/views/decidim/admin/participatory_space_private_users/new.html.erb
 - app/views/decidim/admin/participatory_space_private_users_csv_imports/new.html.erb
+- app/views/decidim/admin/reminders/new.html.erb
 - app/views/decidim/admin/resource_permissions/_options_form.html.erb
 - app/views/decidim/admin/resource_permissions/edit.html.erb
 - app/views/decidim/admin/scope_types/_form.html.erb
@@ -542,6 +547,7 @@ files:
 - app/views/decidim/admin/share_tokens/_share_tokens.html.erb
 - app/views/decidim/admin/shared/_filters.html.erb
 - app/views/decidim/admin/shared/_gallery.html.erb
+- app/views/decidim/admin/shared/_js-callout.html.erb
 - app/views/decidim/admin/shared/landing_page/edit.html.erb
 - app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
 - app/views/decidim/admin/static_page_topics/_form.html.erb
@@ -698,14 +704,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim organization administration

data/app/packs/src/decidim/admin/autocomplete.component.js

@@ -1,146 +0,0 @@
-/* eslint no-unused-vars: 0 */
-/* eslint consistent-return: 0 */
-
-import axios from "axios";
-import * as React from "react";
-import { Async as AsyncSelect } from "react-select";
-import "react-select/scss/default.scss";
-import PropTypes from "prop-types";
-
-export class Autocomplete extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.minCharactersToSearch = 3;
-
-    this.handleChange = (selectedOption) => {
-      this.setState({ selectedOption });
-      if (this.props.changeURL) {
-        axios.get(this.props.changeURL, {
-          headers: {
-            Accept: "text/javascript"
-          },
-          withCredentials: true,
-          params: {
-            id: selectedOption.value
-          }
-        }).
-          then((response) => {
-            const script = document.createElement("script");
-            script.type = "text/javascript";
-            script.innerHTML = response.data;
-            document.getElementsByTagName("head")[0].appendChild(script);
-          }).
-          catch((error) => {
-            if (axios.isCancel(error)) {
-              // console.log("Request canceled", error.message);
-            }
-            else {
-              //
-            }
-          });
-      }
-    };
-
-    this.filterOptions = (options, filter, excludeOptions) => {
-      // Do no filtering, just return all options because
-      // we return a filtered set from server
-      return options;
-    };
-
-    this.onInputChange = (query) => {
-      if (query.length < this.minCharactersToSearch) {
-        this.setState({ noResultsText: this.props.searchPromptText });
-      }
-      else {
-        this.setState({ noResultsText: this.props.noResultsText });
-      }
-    };
-
-    this.loadOptions = (query, callback) => {
-      const lowerQuery = query.toLowerCase();
-
-      if (this.cancelTokenSource) {
-        this.cancelTokenSource.cancel();
-      }
-
-      if (lowerQuery.length < this.minCharactersToSearch) {
-        return callback(null, { options: [], complete: false });
-      }
-
-      this.cancelTokenSource = axios.CancelToken.source();
-      axios.get(this.props.searchURL, {
-        cancelToken: this.cancelTokenSource.token,
-        headers: {
-          Accept: "application/json"
-        },
-        withCredentials: true,
-        params: {
-          term: lowerQuery
-        }
-      }).
-        then((response) => {
-          // CAREFUL! Only set complete to true when there are no more options,
-          // or more specific queries will not be sent to the server.
-          return callback(null, { options: response.data, complete: true });
-        }).
-        catch((error) => {
-          if (!axios.isCancel(error)) {
-            return callback(error, { options: [], complete: false });
-          }
-        });
-    };
-
-    this.state = {
-      options: props.options,
-      selectedOption: props.selected,
-      searchPromptText: props.searchPromptText,
-      noResultsText: props.noResultsText
-    };
-  }
-
-  render() {
-    const { autoload, name, placeholder } = this.props;
-    const { selectedOption, options, searchPromptText, noResultsText } = this.state;
-
-    return (
-      React.createElement("div", { className: "autocomplete-field" },
-        React.createElement(AsyncSelect, {
-          cache: false,
-          name: name,
-          value: selectedOption,
-          options: options,
-          placeholder: placeholder,
-          searchPromptText: searchPromptText,
-          noResultsText: noResultsText,
-          onChange: this.handleChange,
-          onInputChange: this.onInputChange,
-          loadOptions: this.loadOptions,
-          filterOptions: this.filterOptions,
-          autoload: autoload,
-          removeSelected: true,
-          escapeClearsValue: false,
-          onCloseResetsInput: false
-        })
-      )
-    );
-  }
-}
-
-Autocomplete.defaultProps = {
-  autoload: false
-};
-
-Autocomplete.propTypes = {
-  changeURL: PropTypes.string,
-  searchPromptText: PropTypes.string,
-  noResultsText: PropTypes.string,
-  searchURL: PropTypes.string,
-  selected: PropTypes.string,
-  options: PropTypes.array,
-  autoload: PropTypes.bool,
-  name: PropTypes.string,
-  placeholder: PropTypes.string
-}
-
-export default Autocomplete;

data/app/packs/src/decidim/admin/autocomplete.component.test.js

@@ -1,19 +0,0 @@
-import { shallow } from "enzyme";
-import * as React from "react";
-import Autocomplete from "./autocomplete.component";
-
-describe("<Autocomplete />", () => {
-  const name = "custom[name]";
-  const selected = "";
-  const options = [];
-  const placeholder = "Pick a value";
-  const noResultsText = "No results found";
-  const searchPromptText = "Type to search";
-  const searchURL = "/some/url";
-  const changeURL = "/some/other/url";
-
-  it("renders a div of Select", () => {
-    const wrapper = shallow(<Autocomplete name={name} selected={selected} options={options} noResultsText={noResultsText} placeholder={placeholder} searchPromptText={searchPromptText} searchURL={searchURL} changeURL={changeURL} />);
-    expect(wrapper.find(".autocomplete-field").exists()).toBeTruthy();
-  });
-});

data/app/packs/stylesheets/decidim/admin/components/_autocomplete_select.component.scss

@@ -1,19 +0,0 @@
-.autocomplete-field{
-  margin-bottom: 1.5rem;
-
-  .Select{
-    .Select-control,
-    .Select-input,
-    .Select-placeholder,
-    &.Select--single > .Select-control .Select-value{
-      height: 3rem;
-      line-height: 3rem;
-    }
-  }
-}
-
-.autocomplete-field--results-inline{
-  .Select-menu-outer{
-    position: relative;
-  }
-}