Merge pull request #400 from niektenhoopen/v4

Bugfix permission settings #399 and Graphql #401
ethercreative · May 18, 2022 · d97b130 · d97b130
2 parents adf052d + 29d222a
commit d97b130
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/src/Seo.php b/src/Seo.php
@@ -198,10 +198,6 @@ public function getCpNavItem (): ?array
 			$subNav['redirects'] =
 				['label' => 'Redirects', 'url' => 'seo/redirects'];
 
-		/*if ($currentUser->getIsAdmin() || $currentUser->checkPermission('manageSchema'))
-			$subNav['schema'] =
-				['label' => 'Schema', 'url' => 'seo/schema'];*/
-
 		if (Craft::$app->getConfig()->general->allowAdminChanges && $currentUser->getIsAdmin())
 			$subNav['settings'] =
 				['label' => 'Settings', 'url' => 'seo/settings'];
@@ -232,20 +228,20 @@ public function getSettingsResponse(): mixed
 	// Events
 	// =========================================================================
 
-	public function onRegisterPermissions (RegisterUserPermissionsEvent $event): void
-	{
-		$event->permissions['SEO'] = [
-			'manageSitemap' => [
-				'label' => Craft::t('seo', 'Manage Sitemap'),
-			],
-			'manageRedirects' => [
-				'label' => Craft::t('seo', 'Manage Redirects'),
-			],
-//			'manageSchema' => [
-//				'label' => \Craft::t('seo', 'Manage Schema'),
-//			],
-		];
-	}
+    public function onRegisterPermissions (RegisterUserPermissionsEvent $event): void
+    {
+        $event->permissions[] = [
+            'heading' => 'SEO',
+            'permissions' => [
+                'manageSitemap' => [
+                    'label' => Craft::t('seo', 'Manage Sitemap'),
+                ],
+                'manageRedirects' => [
+                    'label' => Craft::t('seo', 'Manage Redirects'),
+                ],
+            ]
+        ];
+    }
 
 	public function onRegisterCPUrlRules (RegisterUrlRulesEvent $event): void
 	{

diff --git a/src/gql/SeoSocialData.php b/src/gql/SeoSocialData.php
@@ -8,6 +8,7 @@
 use craft\gql\GqlEntityRegistry;
 use craft\gql\interfaces\elements\Asset as AssetInterface;
 use craft\helpers\Gql;
+use craft\models\Volume;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
 
@@ -53,11 +54,12 @@ public static function getType(): ObjectType
     /**
      * Get fields which may only be used depending on the craft Gql config
      *
+     * @throws \yii\base\InvalidConfigException
      */
     protected static function getConditionalFields(): array
     {
         // Images may be in any public volume, so verify them all.
-        $volumes = Craft::$app->volumes->getViewableVolumes();
+        $volumes = array_filter(Craft::$app->volumes->getAllVolumes(), static fn (Volume $volume) => $volume->getFs()->hasUrls);
         $awareOfAllPublicVolumes = false;
 
         if (!empty($volumes)) {