Remove extras-namespaces logic

Pulling for PR, will add back to a new branch/PR

Author: smg6511

core/src/Revolution/Processors/System/Dashboard/Widget/GetList.php

@@ -11,7 +11,6 @@
 
 namespace MODX\Revolution\Processors\System\Dashboard\Widget;
 
-use MODX\Revolution\modNamespace;
 use MODX\Revolution\modDashboardWidget;
 use MODX\Revolution\Processors\Model\GetListProcessor;
 use xPDO\Om\xPDOObject;
@@ -36,8 +35,6 @@ class GetList extends GetListProcessor
     public $canEdit = false;
     public $canRemove = false;
 
-    protected $extrasNamespaces = [];
-
     /**
      * @return bool
      */
@@ -52,7 +49,6 @@ public function initialize()
         $this->canCreate = $canManage;
         $this->canEdit = $canManage;
         $this->canRemove = $canManage;
-        $this->extrasNamespaces = modNamespace::class::getExtrasNamespaces($this->modx);
 
         return $initialized;
     }
@@ -104,23 +100,11 @@ public function prepareRow(xPDOObject $object)
             'delete' => $this->canRemove
         ];
         $widgetData = $object->toArray();
-        $widgetNamespace = $object->get('namespace');
         $isCoreWidget = strpos($widgetData['content'], '[[++manager_path]]') === 0;
-        $widgetData['isExtrasWidget'] = in_array($widgetNamespace, $this->extrasNamespaces);
-        $widgetData['isProtected'] = true;
-
-        switch (true) {
-            case $widgetData['isExtrasWidget']:
-                $widgetData['creator'] = $this->modx->lexicon('package_extra');
-                break;
-            case $isCoreWidget:
-                $widgetData['creator'] = 'MODX';
-                break;
-            default:
-                $widgetData['creator'] = $this->modx->lexicon('user');
-                $widgetData['isProtected'] = false;
-        }
-        $widgetData['creator'] = strtolower($widgetData['creator']);
+        $widgetData['isProtected'] = $isCoreWidget
+            ? true
+            : false
+            ;
 
         if ($isCoreWidget) {
             unset($permissions['delete']);

core/src/Revolution/Processors/Workspace/PackageNamespace/GetList.php

@@ -14,7 +14,6 @@
 use MODX\Revolution\modAccessNamespace;
 use MODX\Revolution\modNamespace;
 use MODX\Revolution\modUserGroup;
-use MODX\Revolution\Transport\modTransportPackage;
 use MODX\Revolution\Processors\Model\GetListProcessor;
 use xPDO\Om\xPDOObject;
 use xPDO\Om\xPDOQuery;
@@ -46,7 +45,6 @@ class GetList extends GetListProcessor
     protected $isGridFilter = false;
 
     protected $coreNamespaces;
-    protected $extrasNamespaces = [];
 
     /**
      * {@inheritDoc}
@@ -74,7 +72,6 @@ public function initialize()
         $this->canEdit = $this->modx->hasPermission('namespaces');
         $this->canRemove = $this->modx->hasPermission('namespaces');
         $this->coreNamespaces = $this->classKey::getCoreNamespaces();
-        $this->extrasNamespaces = modNamespace::class::getExtrasNamespaces($this->modx);
 
         return $initialized;
     }
@@ -221,24 +218,13 @@ public function prepareRow(xPDOObject $object)
         $isCoreNamespace = $object->isCoreNamespace($namespaceName);
 
         $namespaceData['reserved'] = ['name' => $this->coreNamespaces];
-        $namespaceData['isProtected'] = true;
-        $namespaceData['isExtrasNamespace'] = in_array($namespaceName, $this->extrasNamespaces);
-
-        switch (true) {
-            case $namespaceData['isExtrasNamespace']:
-                $namespaceData['creator'] = $this->modx->lexicon('package_extra');
-                break;
-            case $isCoreNamespace:
-                $namespaceData['creator'] = 'modx';
-                break;
-            default:
-                $namespaceData['creator'] = $this->modx->lexicon('user');
-                $namespaceData['isProtected'] = false;
-        }
-        $namespaceData['creator'] = strtolower($namespaceData['creator']);
+        $namespaceData['isProtected'] = $isCoreNamespace
+            ? true
+            : false
+            ;
 
-        // Core and Extras paths should only be editable via the installation process
-        if ($isCoreNamespace || $namespaceData['isExtrasNamespace']) {
+        // Core paths should only be editable via the installation process
+        if ($isCoreNamespace) {
             $permissions = [];
         }
         $namespaceData['permissions'] = $permissions;

core/src/Revolution/modNamespace.php

@@ -181,24 +181,6 @@ public function findPolicy($context = '')
         return $policy;
     }
 
-    public static function getExtrasNamespaces(modX $modx): array
-    {
-        $namespaceList = [];
-
-        $c = $modx->newQuery(modTransportPackage::class);
-        $c->select([
-            'name' => 'DISTINCT SUBSTRING_INDEX(`signature`,"-",1)'
-        ]);
-        $namespaces = $modx->getIterator(modTransportPackage::class, $c);
-        $namespaces->rewind();
-        if ($namespaces->valid()) {
-            foreach ($namespaces as $namespace) {
-                $namespaceList[] = $namespace->get('name');
-            }
-        }
-        return $namespaceList;
-    }
-
     /**
      * Returns a list of core Namespaces
      *

manager/assets/modext/widgets/system/modx.grid.dashboard.widgets.js

@@ -28,8 +28,7 @@ MODx.grid.DashboardWidgets = function(config = {}) {
             'content',
             'namespace',
             'lexicon',
-            'size',
-            'creator'
+            'size'
         ],
         paging: true,
         remoteSort: true,
@@ -81,8 +80,7 @@ MODx.grid.DashboardWidgets = function(config = {}) {
                     },
                     scope: this
                 }
-            },
-            this.getCreatorColumnConfig('dashboard')
+            }
         ],
         tbar: [
             this.getCreateButton('dashboard', 'createDashboard'),

manager/assets/modext/workspace/namespace/modx.namespace.panel.js

@@ -62,8 +62,7 @@ MODx.grid.Namespace = function(config = {}) {
             'name',
             'path',
             'assets_path',
-            'perm',
-            'creator'
+            'perm'
         ],
         anchor: '100%',
         paging: true,
@@ -101,7 +100,7 @@ MODx.grid.Namespace = function(config = {}) {
                     // eslint-disable-next-line no-param-reassign
                     metaData.css = this.setEditableCellClasses(
                         record,
-                        [record.json.isProtected, record.json.isExtrasNamespace],
+                        [record.json.isProtected],
                         '',
                         false
                     );
@@ -122,16 +121,15 @@ MODx.grid.Namespace = function(config = {}) {
                     // eslint-disable-next-line no-param-reassign
                     metaData.css = this.setEditableCellClasses(
                         record,
-                        [record.json.isProtected, record.json.isExtrasNamespace],
+                        [record.json.isProtected],
                         '',
                         false
                     );
                     return value;
                 },
                 scope: this
             }
-        },
-        this.getCreatorColumnConfig('namespace')
+        }
         ],
         tbar: [
             this.getCreateButton('namespace', {
@@ -157,7 +155,7 @@ MODx.grid.Namespace = function(config = {}) {
 
     this.on({
         beforeedit: function(e) {
-            if (!this.userCanEditRecord(e.record) || e.record.json.isProtected || e.record.json.isExtrasNamespace) {
+            if (!this.userCanEditRecord(e.record) || e.record.json.isProtected) {
                 return false;
             }
         }