From 7bfdeecaf8f34f319351a31e7e6b8c6dee2d4753 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Wed, 18 Dec 2024 18:11:07 +0200
Subject: [PATCH 1/2] Fix URLs missing associations. Improving mvea tile render
 on error.

---
 app/config/schema/schema.json                 |  2 +-
 app/resources/locales/en_US/error.po          |  3 ++
 app/src/View/Helper/VueHelper.php             | 11 +++---
 app/templates/element/mveaJs.php              | 13 ++++++-
 app/webroot/js/comanage/comanage.js           |  4 ++
 .../comanage/components/mvea/failed-mveas.js  | 39 +++++++++++++++++++
 6 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 app/webroot/js/comanage/components/mvea/failed-mveas.js

diff --git a/app/config/schema/schema.json b/app/config/schema/schema.json
index 11ce07bc1..f01e0e9dc 100644
--- a/app/config/schema/schema.json
+++ b/app/config/schema/schema.json
@@ -516,7 +516,7 @@
       "indexes": {
         "urls_i1": { "columns": [ "type_id" ] }
       },
-      "mvea": [ "person", "external_identity" ],
+      "mvea": [ "person", "person_role", "external_identity", "external_identity_role" ],
       "sourced": true
     },
     
diff --git a/app/resources/locales/en_US/error.po b/app/resources/locales/en_US/error.po
index 2e24c362c..53a0a557a 100644
--- a/app/resources/locales/en_US/error.po
+++ b/app/resources/locales/en_US/error.po
@@ -93,6 +93,9 @@ msgstr "{0} already exists with this name"
 msgid "exists.GroupMember"
 msgstr "{0} is already a member of Group {1}"
 
+msgid "data.Load"
+msgstr "Failed to Load Data"
+
 msgid "fields"
 msgstr "Please recheck these fields: {0}"
 
diff --git a/app/src/View/Helper/VueHelper.php b/app/src/View/Helper/VueHelper.php
index 74c55a226..d471419ce 100644
--- a/app/src/View/Helper/VueHelper.php
+++ b/app/src/View/Helper/VueHelper.php
@@ -48,7 +48,8 @@ class VueHelper extends Helper {
     ],
     'error' => [
       'javascript.copy',
-      'javascript.requires.https'
+      'javascript.requires.https',
+      'data.Load',
     ],
     'field' => [
       'email',
@@ -58,14 +59,14 @@ class VueHelper extends Helper {
       'datepicker.hour',
       'datepicker.minute',
       'status',
-      'unverified'
+      'unverified',
     ],
     'information' => [
       'global.attributes.none',
       'global.value.none',
       'record',
       'report.for',
-      'value.copied'
+      'value.copied',
     ],
     'operation' => [
       'add',
@@ -78,12 +79,12 @@ class VueHelper extends Helper {
       'copy',
       'copy.value',
       'primary',
-      'visit.link'
+      'visit.link',
     ],
     'result' => [
       'failed',
       'removed',
-      'updated'
+      'updated',
     ]
   ];
 
diff --git a/app/templates/element/mveaJs.php b/app/templates/element/mveaJs.php
index 7b1d286bb..ec33c7be2 100644
--- a/app/templates/element/mveaJs.php
+++ b/app/templates/element/mveaJs.php
@@ -47,8 +47,10 @@
 <script type="module">
   <?php if(Cake\Core\Configure::read('debug')): ?>
     import Mveas from "<?= $this->Url->script('comanage/components/mvea/mveas.js') ?>?time=<?= time() ?>";
+    import FailedMveas from "<?= $this->Url->script('comanage/components/mvea/failed-mveas.js') ?>?time=<?= time() ?>";
   <?php else: ?>
     import Mveas from "<?= $this->Url->script('comanage/components/mvea/mveas.js') ?>";
+    import FailedMveas from "<?= $this->Url->script('comanage/components/mvea/failed-mveas.js') ?>";
   <?php endif; ?>
   
   const app = Vue.createApp({
@@ -70,7 +72,8 @@
       }
     },
     components: {
-      Mveas
+      Mveas,
+      FailedMveas
     },
     methods: {
       getMveas(mveaType,entityType) {
@@ -88,12 +91,13 @@
       },
       setMveas(xhr) {
         this.mveas = xhr.responseJSON;
+        this.isLoading = false
       },
       setError(txt) {
         this.error = txt;
       },
       generalXhrFailCallback(xhr) {
-        stopSpinner();
+        stopMiniSpinner();
         this.successTxt = '';
         if(xhr.statusText != undefined && xhr.statusText != '') {
           this.setError(xhr.statusText)
@@ -102,6 +106,7 @@
           console.error(xhr);
           this.setError(this.txt.error500);
         }
+        this.isLoading = false
       },
       launchModal(title,url,componentRef) {
         window.cmMveaModal.launch(title,url,componentRef);
@@ -127,10 +132,14 @@
               <li><span class="visually-hidden">Loading...</span></li>
             </ul>
             <mveas
+              v-if="this.mveas !== ''"
               :mveas="this.mveas"
               :core="this.core"
               :txt="this.txt">
             </mveas>
+            <failed-mveas v-if="this.mveas === '' && !this.isLoading"
+                          :core="this.core"
+                          :txt="this.txt"/>
           </div>
         </div>
       </div>
diff --git a/app/webroot/js/comanage/comanage.js b/app/webroot/js/comanage/comanage.js
index 619a6292a..807be0397 100644
--- a/app/webroot/js/comanage/comanage.js
+++ b/app/webroot/js/comanage/comanage.js
@@ -55,6 +55,10 @@ function stopSpinner() {
   $("#co-loading").hide();
 }
 
+function stopMiniSpinner() {
+  $(".co-loading-mini").hide();
+}
+
 // Show fields in .form-list output.
 // fields          - array of field IDs
 // isPageLoad      - boolean, true for first page load
diff --git a/app/webroot/js/comanage/components/mvea/failed-mveas.js b/app/webroot/js/comanage/components/mvea/failed-mveas.js
new file mode 100644
index 000000000..0e12806ef
--- /dev/null
+++ b/app/webroot/js/comanage/components/mvea/failed-mveas.js
@@ -0,0 +1,39 @@
+/**
+ * COmanage Registry MVEA Component JavaScript
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+export default {
+  props: {
+    core: Object,
+    txt: Object
+  },
+  template: `
+    <ul class="cm-mvea fields co-alert alert-danger">
+      <li class="field-data-container cm-mvea-no-attributes-msg">
+        <div class="field-data">{{ this.txt['error.data.Load'] }}</div>
+      </li>
+    </ul>
+  `
+}

From 8a18879aac35cdac7826a2e2ca8149c16e746658 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Wed, 18 Dec 2024 18:14:59 +0200
Subject: [PATCH 2/2] Add UrlsTable missing changes.

---
 app/src/Model/Table/UrlsTable.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/Model/Table/UrlsTable.php b/app/src/Model/Table/UrlsTable.php
index a19c6768d..0714f0838 100644
--- a/app/src/Model/Table/UrlsTable.php
+++ b/app/src/Model/Table/UrlsTable.php
@@ -74,6 +74,7 @@ public function initialize(array $config): void {
     // Define associations
     $this->belongsTo('People');
     $this->belongsTo('ExternalIdentities');
+    $this->belongsTo('ExternalIdentityRoles');
     $this->belongsTo('Types');
     $this->belongsTo('SourceUrls')
          ->setClassName('Urls')
@@ -82,7 +83,7 @@ public function initialize(array $config): void {
     
     $this->setDisplayField('url');
     
-    $this->setPrimaryLink(['external_identity_id', 'person_id']);
+    $this->setPrimaryLink(['external_identity_id', 'external_identity_role_id', 'person_id', 'person_role_id']);
     $this->setRequiresCO(true);
     $this->setRedirectGoal('self');
     $this->setRedirectGoal(action: 'delete', goal: 'deleted');