From b46db07f68eedae00af51d86c51005147fff3121 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Jun 2021 02:51:32 -0700
Subject: [PATCH] msgtplui - Simplify 'record.*' expressions. Order explicitly
 on (title,language).

---
 ext/msgtplui/ang/msgtplui/ListCtrl.js   | 22 +++++++++++++++++++---
 ext/msgtplui/ang/msgtplui/Workflow.html | 14 +++++++-------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ext/msgtplui/ang/msgtplui/ListCtrl.js b/ext/msgtplui/ang/msgtplui/ListCtrl.js
index c2fa577de5..6900aa21b4 100644
--- a/ext/msgtplui/ang/msgtplui/ListCtrl.js
+++ b/ext/msgtplui/ang/msgtplui/ListCtrl.js
@@ -1,5 +1,21 @@
 (function(angular, $, _) {
 
+  /**
+   * Convert keys with literal dots to Javascript subtrees.
+   *
+   * @param rec
+   *   Ex: {'foo.bar.whiz:bang': 123}
+   * @returns {{}}
+   *   Ex: {foo_bar_whiz_bang: 123}
+   */
+  function simpleKeys(rec) {
+    var newRec = {};
+    angular.forEach(rec, function(value, key) {
+      newRec[key.replaceAll('.','_').replaceAll(':', '_')] = value;
+    });
+    return newRec;
+  }
+
   angular.module('msgtplui').controller('MsgtpluiListCtrl', function($scope, $route, crmApi4, crmStatus, crmUiAlert, crmUiHelp, prefetch, $location) {
     var ts = $scope.ts = CRM.ts('msgtplui');
     var hs = $scope.hs = crmUiHelp({file: 'CRM/msgtplui/User'}); // See: templates/CRM/msgtplui/User.hlp
@@ -16,7 +32,7 @@
     });
 
     var ctrl = this;
-    ctrl.records = [].concat(prefetch.records, prefetch.translations || []);
+    ctrl.records = [].concat(prefetch.records, _.map(prefetch.translations || [], simpleKeys));
 
     /**
      *
@@ -29,8 +45,8 @@
         return CRM.url('civicrm/admin/messageTemplates/add', {action: 'update', id: record.id, reset: 1});
       }
       var url = '#/edit?id=' + encodeURIComponent(record.id);
-      if (record['tx.language']) {
-        url = url + '&lang=' + encodeURIComponent(record['tx.language']);
+      if (record.tx_language) {
+        url = url + '&lang=' + encodeURIComponent(record.tx_language);
       }
       if (variant === 'draft') {
         url = url + '&status=draft';
diff --git a/ext/msgtplui/ang/msgtplui/Workflow.html b/ext/msgtplui/ang/msgtplui/Workflow.html
index 60f75dc554..6a1515fbe4 100644
--- a/ext/msgtplui/ang/msgtplui/Workflow.html
+++ b/ext/msgtplui/ang/msgtplui/Workflow.html
@@ -19,27 +19,27 @@
     </tr>
     </thead>
     <tbody>
-    <tr ng-repeat="record in $ctrl.records | filter:filters.text | orderBy:'msg_title'">
+    <tr ng-repeat="record in $ctrl.records | filter:filters.text | orderBy:['msg_title','tx_language_label']">
       <td>{{record.msg_title}}</td>
-      <td>{{record['tx.language:label'] || ts('Standard')}}</td>
+      <td>{{record.tx_language_label || ts('Standard')}}</td>
       <td>
-        <span ng-if="!record['tx.language'] || !!record['tx.statuses'].active">
+        <span ng-if="!record.tx_language || !!record.tx_statuses.active">
           <a class="text-success" crm-icon="fa-file" ng-href="{{$ctrl.editUrl(record)}}">{{ts('Current')}}</a>
         </span>
-        <span ng-if="!(!record['tx.language'] || !!record['tx.statuses'].active)">
+        <span ng-if="!(!record.tx_language || !!record.tx_statuses.active)">
           <span class="text-danger" crm-icon="fa-file">{{ts('Current')}}</span>
         </span>
       </td>
       <td>
-        <span ng-if="!!record['tx.statuses'].draft">
+        <span ng-if="!!record.tx_statuses.draft">
           <a class="text-warning" crm-icon="fa-file" ng-href="{{$ctrl.editUrl(record, 'draft')}}">{{ts('Draft')}}</a>
         </span>
-        <span ng-if="!record['tx.statuses'].draft">
+        <span ng-if="!record.tx_statuses.draft">
           <span class="text-muted" crm-icon="fa-file">{{ts('Draft')}}</span>
         </span>
       </td>
       <td>
-        <span ng-if="!record['tx.language']">
+        <span ng-if="!record.tx_language">
           <a class="" crm-icon="fa-plus" ng-click="crmUiAlert({title: 'Not implemented', text: '', type: 'error'})">{{ts('Translate')}}</a>
         </span>
       </td>
-- 
2.25.1