Adds code to hide install and update button when enable_plugins_admin…

…=0 is set, #PG-3693 (#22521) * Adds code to hide install and update button when enable_plugins_admin=0 set, #PG-3693 * UI test fix * UI screenshots updated * Added code to show more details button instead of blank * Updated screenshot
matomo-org · Aug 28, 2024 · 52feda6 · 52feda6
1 parent f7b8630
commit 52feda6
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 41 deletions.
diff --git a/plugins/Marketplace/tests/UI/Marketplace_spec.js b/plugins/Marketplace/tests/UI/Marketplace_spec.js
@@ -157,6 +157,19 @@ describe("Marketplace", function () {
             await captureMarketplace('themes_with_valid_license_' + mode);
         });
 
+         it('should show themes page without install button when enable_plugins_admin=0', async function () {
+            setEnvironment(mode, validLicense);
+            testEnvironment.overrideConfig('General', 'enable_plugins_admin', '0');
+            testEnvironment.save();
+
+            await page.goto('about:blank');
+            await page.goto(themesUrl);
+
+            await captureMarketplace('themes_with_valid_license_disabled_' + mode);
+            testEnvironment.overrideConfig('General', 'enable_plugins_admin', '1');
+            testEnvironment.save();
+         });
+
         it('should show free plugin details', async function() {
             setEnvironment(mode, noLicense);
 

diff --git a/...enshots/Marketplace_themes_with_valid_license_disabled_multiUserEnvironment.png b/...enshots/Marketplace_themes_with_valid_license_disabled_multiUserEnvironment.png
diff --git a/...pected-screenshots/Marketplace_themes_with_valid_license_disabled_superuser.png b/...pected-screenshots/Marketplace_themes_with_valid_license_disabled_superuser.png
diff --git a/...UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_user.png b/...UI/expected-screenshots/Marketplace_themes_with_valid_license_disabled_user.png
diff --git a/plugins/Marketplace/vue/dist/Marketplace.umd.js b/plugins/Marketplace/vue/dist/Marketplace.umd.js
diff --git a/plugins/Marketplace/vue/dist/Marketplace.umd.min.js b/plugins/Marketplace/vue/dist/Marketplace.umd.min.js
diff --git a/plugins/Marketplace/vue/src/PluginList/CTAContainer.vue b/plugins/Marketplace/vue/src/PluginList/CTAContainer.vue
@@ -34,7 +34,7 @@
     <template
       v-else-if="plugin.canBeUpdated && 0 == plugin.missingRequirements.length"
     >
-      <a v-if="isAutoUpdatePossible"
+      <a v-if="isAutoUpdatePossible && isPluginsAdminEnabled"
          tabindex="7"
          class="btn btn-block"
          :href="linkToUpdate(plugin.name)"
@@ -83,7 +83,7 @@
       </template>
     </div>
 
-    <div v-else-if="plugin.isEligibleForFreeTrial && !inModal"
+    <div v-else-if="plugin.isEligibleForFreeTrial && !inModal && isPluginsAdminEnabled"
        class="btn btn-block purchaseable"
        :title="translate('Marketplace_StartFreeTrial')"
     >{{ translate('Marketplace_StartFreeTrial') }}</div>
@@ -125,13 +125,22 @@
         />)</span>
     </div>
 
-    <a v-else
+    <a v-else-if="isPluginsAdminEnabled"
        tabindex="7"
        :href="linkToInstall(plugin.name)"
        class="btn btn-block"
     >
       {{ translate('Marketplace_ActionInstall') }}
     </a>
+
+    <template v-else>
+      <MoreDetailsAction
+        v-if="!inModal"
+        :show-as-button="true"
+        :label="translate('General_MoreDetails')"
+        @action="$emit('openDetailsModal')"
+      />
+    </template>
   </template>
 
   <a v-else-if="plugin.isTrialRequested"