1.0.2

internetztube · Oct 25, 2021 · 9375b78 · 9375b78
1 parent a71ac4e
commit 9375b78
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 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/).
 
+## 1.0.2 - 2021-10-25
+### Added
+- Show element relations of other sites, when there are none in the current site.
+- Improved frontend performance by delaying the requests by 100ms.
+
 ## 1.0.1 - 2021-10-23
 ### Fixed
 - Fixed composer.lock

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "internetztube/craft-element-relations",
     "description": "Shows all relations of an element.",
     "type": "craft-plugin",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/controllers/ElementRelationsController.php b/src/controllers/ElementRelationsController.php
@@ -25,13 +25,21 @@ public function actionGetByElementId()
         $elementId = \Craft::$app->request->getParam('elementId');
         $siteId = \Craft::$app->request->getParam('siteId');
         $size = \Craft::$app->request->getParam('size', 'default');
+        $size = $size === 'small' ? Cp::ELEMENT_SIZE_SMALL : Cp::ELEMENT_SIZE_LARGE;
         $element = \Craft::$app->elements->getElementById($elementId, null, $siteId);
         if (!$element) throw new NotFoundHttpException;
         $relations = ElementRelationsService::getRelationsFromElement($element);
-        if (!count($relations)) { return '<span style="color: #da5a47;">Unused</span>'; }
-        if ($size === 'small') {
-            return Cp::elementPreviewHtml($relations, Cp::ELEMENT_SIZE_SMALL);
+
+        if (!count($relations)) {
+            $relationsAnySite = ElementRelationsService::getRelationsFromElement($element, true);
+            if (count($relationsAnySite) === 0) {
+                return '<span style="color: #da5a47;">Unused</span>';
+            } else {
+                $result = 'Unused in this site, but used in others:<br />';
+                $result .= Cp::elementPreviewHtml($relationsAnySite, $size);
+                return $result;
+            }
         }
-        return Cp::elementPreviewHtml($relations, Cp::ELEMENT_SIZE_LARGE);
+        return Cp::elementPreviewHtml($relations, $size);
     }
 }
diff --git a/src/fields/ElementRelationsField.php b/src/fields/ElementRelationsField.php
@@ -36,16 +36,15 @@ public function getInputHtml($value, ElementInterface $element = null): string
 
     private function _getLazyHtml(Element $element, string $size = 'default')
     {
+        $id = sprintf('%s-%s-%s', $element->id, $element->siteId, StringHelper::randomString(6));
         $endpoint = UrlHelper::actionUrl('element-relations/element-relations/get-by-element-id', [
             'elementId' => $element->id,
             'siteId' => $element->siteId,
+            'size' => $size,
         ], null, false);
         return Craft::$app->getView()->renderTemplate(
             'element-relations/_components/fields/Relations_lazy',
-            [
-                'endpoint' => $endpoint,
-                'id' => sprintf('%s-%s-%s', $element->id, $element->siteId, StringHelper::randomString(6)),
-            ]
+            ['endpoint' => $endpoint, 'id' => $id]
         );
     }
 }
diff --git a/src/services/ElementRelationsService.php b/src/services/ElementRelationsService.php
@@ -29,14 +29,14 @@ public static function getRelationsFromElement(Element $sourceElement, bool $any
         })->filter()->values()->toArray();
     }
 
-    private static function getElementById (int $elementId, Site $site): ?Element
+    private static function getElementById (int $elementId, $site): ?Element
     {
         $result = (new Query())->select(['type'])->from(Table::ELEMENTS)->where(['id' => $elementId])->one();
         if (!$result) { return null; } // relation is broken
         return $result['type']::find()->id($elementId)->anyStatus()->site($site)->one();
     }
 
-    private static function getRootElement (Element $element, Site $site): ?Element
+    private static function getRootElement (Element $element, $site): ?Element
     {
         if (!isset($element->ownerId) || !$element->ownerId) { return $element; }
         $sourceElement = self::getElementById($element->ownerId, $site);

diff --git a/src/templates/_components/fields/Relations_lazy.twig b/src/templates/_components/fields/Relations_lazy.twig
@@ -3,8 +3,20 @@
 </div>
 <script>
     (async () => {
+        if (!window.elementRelationsLazyOffset) {
+            window.elementRelationsLazyOffset = 1
+        } else {
+            window.elementRelationsLazyOffset += 100
+        }
+        // Reset `window.elementRelationsLazyOffset` when all functions have been invoked.
+        if (window.elementRelationsDoneLoadingTimeout) { clearTimeout(window.elementRelationsDoneLoadingTimeout) }
+        window.elementRelationsDoneLoadingTimeout = setTimeout(() => { window.elementRelationsLazyOffset = 0 }, 200)
+
+        const sleep = t => new Promise(s => setTimeout(s, t))
+        await sleep(window.elementRelationsLazyOffset)
         const $container = document.querySelector('[data-id="{{ id }}"].element-relations-lazy')
         const request = await fetch('{{ endpoint | raw }}')
+        if (!$container) { return }
         $container.innerHTML = await request.text()
     })()
 </script>