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 4, 2024 · da9edf4 · da9edf4
1 parent 9f1bc08
commit da9edf4
Show file tree

Hide file tree

Showing 44 changed files with 1,095 additions and 1,208 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:
     factory: SilverStripe\Core\Cache\CacheFactory
     constructor:
-      namespace: "SiteTree_PageIcons"
+      namespace: "SiteTree_PageIcons"
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
@@ -91,7 +91,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(