API Make CMSMain more generic

Remove hardcoded references to pages and SiteTree Remove assumption that records are versioned Remove or validate assumptions about methods on the model class Improve general architecture of CMSMain
silverstripe · Nov 28, 2024 · 3cca2a1 · 3cca2a1
1 parent 7c5e243
commit 3cca2a1
Show file tree

Hide file tree

Showing 62 changed files with 1,376 additions and 1,424 deletions.
diff --git a/_config/adminpanels.yml b/_config/adminpanels.yml
@@ -2,4 +2,4 @@
 Name: cmsdefaultadmin
 ---
 SilverStripe\Admin\AdminRootController:
-  default_panel: SilverStripe\CMS\Controllers\CMSPagesController
+  default_panel: SilverStripe\CMS\Controllers\CMSMain
diff --git a/_config/cache.yml b/_config/cache.yml
@@ -4,15 +4,15 @@ After:
   - '#corecache'
 ---
 SilverStripe\Core\Injector\Injector:
-  Psr\SimpleCache\CacheInterface.CMSMain_SiteTreeHints:
+  Psr\SimpleCache\CacheInterface.CMSMain_TreeHints:
     factory: SilverStripe\Core\Cache\CacheFactory
     constructor:
-      namespace: "CMSMain_SiteTreeHints"
+      namespace: "CMSMain_TreeHints"
   Psr\SimpleCache\CacheInterface.SiteTree_CreatableChildren:
     factory: SilverStripe\Core\Cache\CacheFactory
     constructor:
       namespace: "SiteTree_CreatableChildren"
-  Psr\SimpleCache\CacheInterface.SiteTree_PageIcons:
+  Psr\SimpleCache\CacheInterface.CMS_RecordIcons:
     factory: SilverStripe\Core\Cache\CacheFactory
     constructor:
-      namespace: "SiteTree_PageIcons"
+      namespace: "CMS_RecordIcons"
diff --git a/_config/config.yml b/_config/config.yml
@@ -3,7 +3,7 @@ Name: cmsextensions
 ---
 SilverStripe\Admin\LeftAndMain:
   extensions:
-    - SilverStripe\CMS\Controllers\LeftAndMainPageIconsExtension
+    - SilverStripe\CMS\Controllers\LeftAndMainRecordIconsExtension
     - SilverStripe\CMS\Controllers\LeftAndMainBatchActionsExtension
 ---
 Name: cmsmodals

diff --git a/_config/permissions.yml b/_config/permissions.yml
@@ -17,4 +17,3 @@ SilverStripe\Core\Injector\Injector:
       Services:
         - '%$SilverStripe\Security\PermissionChecker.sitetree'
         - '%$SilverStripe\CMS\Controllers\CMSMain'
-        - '%$SilverStripe\CMS\Model\SiteTree'
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/CMSMain.AddForm.js b/client/src/legacy/CMSMain.AddForm.js
@@ -123,16 +123,16 @@ $.entwine('ss', function($){
      * @param {string} defaultChildClass
      */
     updateSelectionFilter: function(disallowedChildren, defaultChildClass) {
-      var currentSelection = this.find('#Form_AddForm_PageType div.radio.selected')[0];
+      var currentSelection = this.find('#Form_AddForm_RecordType div.radio.selected')[0];
       var keepSelection = false;
 
       // Limit selection
       var allAllowed = null; // troolian
-      this.find('#Form_AddForm_PageType div.radio').each(function (i, el) {
+      this.find('#Form_AddForm_RecordType div.radio').each(function (i, el) {
         var className = $(this).find('input').val(),
           isAllowed = ($.inArray(className, disallowedChildren) === -1);
 
-        // Avoid changing the selected pagetype if still allowed
+        // Avoid changing the selected record type if still allowed
         if (el === currentSelection && isAllowed) {
           keepSelection = true;
         }
@@ -153,16 +153,16 @@ $.entwine('ss', function($){
         var selectedEl = $(currentSelection).parents('li:first');
       } else if (defaultChildClass) {
         var selectedEl = this
-          .find('#Form_AddForm_PageType div.radio input[value=' + defaultChildClass + ']')
+          .find('#Form_AddForm_RecordType div.radio input[value=' + defaultChildClass + ']')
           .parents('li:first');
       } else {
-        var selectedEl = this.find('#Form_AddForm_PageType div.radio:not(.disabled):first');
+        var selectedEl = this.find('#Form_AddForm_RecordType div.radio:not(.disabled):first');
       }
       selectedEl.setSelected(true);
       selectedEl.siblings().setSelected(false);
 
-      // Disable the "Create" button if none of the pagetypes are available
-      if(this.find('#Form_AddForm_PageType div.radio:not(.disabled)').length) {
+      // Disable the "Create" button if none of the record types are available
+      if(this.find('#Form_AddForm_RecordType div.radio:not(.disabled)').length) {
         this.find('button[name=action_doAdd]').removeAttr('disabled');
       } else {
         this.find('button[name=action_doAdd]').attr('disabled', 'disabled');
@@ -172,7 +172,7 @@ $.entwine('ss', function($){
     }
   });
 
-  $(".cms-add-form #Form_AddForm_PageType div.radio").entwine({
+  $(".cms-add-form #Form_AddForm_RecordType div.radio").entwine({
     onclick: function(e) {
       this.setSelected(true);
     },

diff --git a/client/src/legacy/CMSMain.Tree.js b/client/src/legacy/CMSMain.Tree.js
@@ -81,8 +81,7 @@ $.entwine('ss.tree', function($) {
           }
 
           // Build a list for allowed children as submenu entries
-          var pagetype = node.data('pagetype'),
-              id = node.data('id'),
+          var id = node.data('id'),
               allowedChildren = node.find('>a .item').data('allowedchildren'),
               menuAllowedChildren = {},
               hasAllowedChildren = false;
@@ -91,7 +90,7 @@ $.entwine('ss.tree', function($) {
           $.each(allowedChildren, function(index, child) {
             hasAllowedChildren = true;
             menuAllowedChildren["allowedchildren-" + child.ClassName] = {
-              'label': '<span class="jstree-pageicon ' + child.IconClass + '"></span>' + child.Title,
+              'label': '<span class="jstree-recordicon ' + child.IconClass + '"></span>' + child.Title,
               '_class': 'class-' + child.ClassName.replace(/[^a-zA-Z0-9\-_:.]+/g, '_'),
               'action': function(obj) {
                 $('.cms-container').entwine('.ss').loadPanel(