Merge branch 'release/4.0.1'

studioespresso · Jan 21, 2024 · cdc4fe7 · cdc4fe7
2 parents 62d45cc + e60469c
commit cdc4fe7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.0.1 - 2024-01-21
+### Fixed
+- Fixed on issue on the schema settings screen, when no settings had been defined yet
+
+
 ## 4.0.0 - 2024-01-20
 ### Added
 - JSON-LD Schema.org markup

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "studioespresso/craft-seo-fields",
     "description": "Fields for your SEO & OG meta data",
     "type": "craft-plugin",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/models/SeoFieldModel.php b/src/models/SeoFieldModel.php
@@ -75,16 +75,49 @@ public function getSchema(Element $element = null)
             return null;
         }
 
-        $schema = SeoFields::getInstance()->schemaService->getSchemaForElement($element);
-        if ($schema) {
-            \Craft::$app->getView()->registerScript(
-                Json::encode($schema),
-                View::POS_END, [
-                    'type' => 'application/ld+json'
-                ]
-            );
+        try {
+            $schema = null;
+            $settings = $this->siteDefault->getSchema();
+            switch (get_class($element)) {
+                case Entry::class:
+                    $schemaSettings = $settings['sections'];
+                    $sectionId = $element->section->id;
+                    $schemaClass = $schemaSettings[$sectionId];
+
+                    /** @var $schema Schema */
+                    $schema = \Craft::createObject($schemaClass);
+                    $schema->name($this->getMetaTitle($element, false) ?? "");
+                    $schema->description($this->getMetaDescription() ?? "");
+                    $schema->url($element->getUrl() ?? "");
+                    break;
+                case Category::class:
+                    $schemaSettings = $settings['groups'];
+                    $groupId = $element->group->id;
+                    $schemaClass = $schemaSettings[$groupId];
+
+                    /** @var $schema Schema */
+                    $schema = Craft::createObject($schemaClass);
+                    $schema->name($this->getMetaTitle($element, false) ?? "");
+                    $schema->description($this->getMetaDescription() ?? "");
+                    $schema->url($element->getUrl() ?? "");
+                    break;
+            }
+            if ($schema) {
+                \Craft::$app->getView()->registerScript(
+                    Json::encode($schema),
+                    View::POS_END, [
+                        'type' => 'application/ld+json'
+                    ]
+                );
+            }
+
+
+        } catch (\Exception $e) {
+            \Craft::error($e, SeoFields::class);
+            return null;
         }
 
+
     }
 
     public function getSiteNameWithSeperator()

diff --git a/src/templates/_includes/_schema/_sections.twig b/src/templates/_includes/_schema/_sections.twig
@@ -12,9 +12,9 @@
         <tbody>
 
         {% set schemaSettings = data.schema|json_decode %}
-        {% set sectionSettings = schemaSettings.sections %}
+        {% set sectionSettings = schemaSettings.sections ?? [] %}
         {% for section in sections %}
-            {% set settings = attribute(sectionSettings, section.id) ?? [] %}
+            {% set settings = attribute(sectionSettings, section.id) ??  null %}
             <tr>
                 <th>{{ section.name }}</th>
                 <td>
@@ -24,7 +24,7 @@
                         options: options,
                         includeEnvVars: false,
                         allowedEnvValues: false,
-                        value: settings,
+                        value: settings ,
                     }) }}
                 </td>
             </tr>