refactor: VOL-4635 remove docman support

dvsa · Jun 17, 2024 · 9d97f0d · 9d97f0d
1 parent 0be45c6
commit 9d97f0d
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 37 deletions.
diff --git a/module/Admin/src/Controller/MyDetailsController.php b/module/Admin/src/Controller/MyDetailsController.php
@@ -94,11 +94,4 @@ private function redirectToIndex()
             true
         );
     }
-
-    protected function alterFormForEdit($form, $formData)
-    {
-        /* @var $form \Common\Form\Form */
-        $form->get('userSettings')->remove('osType');
-        return $form;
-    }
 }
diff --git a/module/Admin/src/Controller/UserManagementController.php b/module/Admin/src/Controller/UserManagementController.php
@@ -228,11 +228,6 @@ protected function alterFormForEdit($form, $data)
                 //transport manager and operator, we don't modify the form
         }
 
-        //Hide OS type select for non internal users
-        if ($data['userType']['userType'] != RefData::USER_TYPE_INTERNAL) {
-            $form->get('userSettings')->remove('osType');
-        }
-
         return $form;
     }
 

diff --git a/module/Admin/src/Form/Model/Fieldset/UserSettings.php b/module/Admin/src/Form/Model/Fieldset/UserSettings.php
@@ -21,16 +21,4 @@ class UserSettings
      * @Form\Type("OlcsCheckbox")
      */
     public $translateToWelsh = null;
-
-    /**
-     * @Form\Attributes({"id":"osType"})
-     * @Form\Options({
-     *     "label": "User type",
-     *     "disable_inarray_validator": false,
-     *     "service_name": "Common\Service\Data\RefData",
-     *     "category": "user_os"
-     * })
-     * @Form\Type("DynamicSelect")
-     */
-    public $osType = null;
 }
diff --git a/module/Olcs/src/Controller/Document/AbstractDocumentController.php b/module/Olcs/src/Controller/Document/AbstractDocumentController.php
@@ -278,11 +278,4 @@ protected function getUriPattern(): string
         }
         return (string) $url_pattern;
     }
-
-    protected function getOsType(): string
-    {
-        $query = MyAccount::create([]);
-        $response = $this->handleQuery($query)->getResult();
-        return $response['osType']['id'] ?? RefData::USER_OS_TYPE_WINDOWS_7;
-    }
 }
diff --git a/module/Olcs/src/Data/Mapper/User.php b/module/Olcs/src/Data/Mapper/User.php
@@ -69,7 +69,6 @@ public static function mapFromResult(array $data)
             switch ($data['userType']) {
                 case 'internal':
                     $formData['userType']['team'] = $data['team']['id'];
-                    $formData['userSettings']['osType'] = $data['osType'];
                     break;
                 case 'transport-manager':
                     $formData['userType']['currentTransportManager'] = $data['transportManager']['id'];
@@ -135,7 +134,6 @@ public static function mapFromForm(array $data)
         switch ($data['userType']['userType']) {
             case 'internal':
                 $commandData['team'] = $data['userType']['team'];
-                $commandData['osType'] = $data['userSettings']['osType'];
                 break;
             case 'transport-manager':
                 $commandData['application'] = $data['userType']['applicationTransportManagers']['application'];

diff --git a/test/Olcs/src/Data/Mapper/UserTest.php b/test/Olcs/src/Data/Mapper/UserTest.php
@@ -84,7 +84,6 @@ public function mapFromResultDataProvider()
                         ],
                     ],
                     'translateToWelsh' => 'Y',
-                    'osType' => 'windows_10'
                 ],
                 "expected" => [
                     'id' => 987,
@@ -126,7 +125,6 @@ public function mapFromResultDataProvider()
                     ],
                     'userSettings' => [
                         'translateToWelsh' => 'Y',
-                        'osType' => 'windows_10'
                     ],
                 ]
             ],
@@ -396,7 +394,6 @@ public function mapFromFormDataProvider()
                     ],
                     'userSettings' => [
                         'translateToWelsh' => 'Y',
-                        'osType' => 'windows_10'
                     ],
                 ],
                 "expected" => [
@@ -434,7 +431,6 @@ public function mapFromFormDataProvider()
                         ],
                     ],
                     'translateToWelsh' => 'Y',
-                    'osType' => 'windows_10'
                 ],
             ],
             // edit - transport-manager