Fix intergram deface integration in admin (#255)

microstudi · web-flow · commit 720e68b18124 · 2023-11-21T12:45:46.000+01:00
* rebuild intergram integration in admin

* bump version

* bundle for legacy
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+v0.10.2
+------
+
+Compatibility:
+  - Decidim v0.27.4
+  - Decidim v0.26.8
+
+Features:
+  - Added translations
+  - Fix deface override updating <body> tag in the admin
+
 v0.10.1
 ------
 
diff --git a/Gemfile.legacy.lock b/Gemfile.legacy.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decidim-decidim_awesome (0.10.1)
+    decidim-decidim_awesome (0.10.2)
       decidim-admin (>= 0.26.0, < 0.28)
       decidim-core (>= 0.26.0, < 0.28)
       deface (>= 1.5)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decidim-decidim_awesome (0.10.1)
+    decidim-decidim_awesome (0.10.2)
       decidim-admin (>= 0.26.0, < 0.28)
       decidim-core (>= 0.26.0, < 0.28)
       deface (>= 1.5)
diff --git a/app/overrides/layouts/decidim/admin/_application/add_intergram.html.erb.deface b/app/overrides/layouts/decidim/admin/_application/add_intergram.html.erb.deface
diff --git a/app/overrides/layouts/decidim/admin/_header/replace_scripts.html.erb.deface b/app/overrides/layouts/decidim/admin/_header/replace_scripts.html.erb.deface
@@ -4,3 +4,6 @@
 
 <%= javascript_pack_tag "decidim_admin_decidim_awesome", defer: false %>
 <%= javascript_pack_tag("decidim_admin_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>
+<% if awesome_config[:intergram_for_admins] %>
+  <%= render partial: "layouts/decidim/decidim_awesome/intergram_widget", locals: { settings: organization_awesome_config[:intergram_for_admins_settings] } %>
+<% end %>
diff --git a/lib/decidim/decidim_awesome/version.rb b/lib/decidim/decidim_awesome/version.rb
@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.10.1"
+    VERSION = "0.10.2"
     COMPAT_DECIDIM_VERSION = [">= 0.26.0", "< 0.28"].freeze
   end
 end
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "decidim-module-decidim_awesome",
-  "version": "0.9.3",
+  "version": "0.10.2",
   "description": "Mods and tweaks for Decidim",
   "main": "index.js",
   "directories": {
diff --git a/spec/system/awesome_intergram_spec.rb b/spec/system/awesome_intergram_spec.rb
@@ -79,6 +79,16 @@
 
   it_behaves_like "shows the chat", false
 
+  if legacy_version?
+    it "has the script tag in the head" do
+      expect(page).to have_xpath("//head/script[@src='#{intergram_url}']", visible: :all)
+    end
+  else
+    it "has the script tag in the body" do
+      expect(page).to have_xpath("//body/script[@src='#{intergram_url}']", visible: :all)
+    end
+  end
+
   context "when login is required" do
     let(:require_login) { true }
 
@@ -118,6 +128,9 @@
     end
 
     it_behaves_like "shows the chat", true
+    it "has the script tag in the head" do
+      expect(page).to have_xpath("//head/script[@src='#{intergram_url}']", visible: :all)
+    end
 
     context "and admin chat is disabled" do
       let(:intergram_for_admins) { false }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "decidim-module-decidim_awesome",`
`3`		`- "version": "0.9.3",`
	`3`	`+ "version": "0.10.2",`
`4`	`4`	`"description": "Mods and tweaks for Decidim",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"directories": {`