Revert "OHRM5X-2117: Exclude claim module from v5.4 (orangehrm#1661)"

This reverts commit 7b486ef.

Author: RajithaKumara

.github/workflows/build.yml

@@ -20,7 +20,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          rm -r src/plugins/orangehrmClaimPlugin
           cd src
           php7.4 -f /usr/bin/composer install --no-dev
           php7.4 -f /usr/bin/composer dump-autoload --optimize --no-dev --classmap-authoritative

build/build.xml

@@ -68,9 +68,6 @@
         <exclude name="src/test/**"/>
         <exclude name="src/plugins/**/test/**"/>
 
-        <exclude name="installer/Migration/V5_5_0/**"/>
-        <exclude name="src/plugins/orangehrmClaimPlugin/**"/>
-        <exclude name="src/client/src/orangehrmClaimPlugin/**"/>
         <exclude name="src/plugins/orangehrmAuthenticationPlugin/lib/**"/>
         <exclude name="src/plugins/orangehrmCoreOAuthPlugin/lib/**"/>
         <exclude name="src/plugins/orangehrmOpenidAuthenticationPlugin/**"/>

devTools/core/src/Command/GenerateOpenApiDocCommand.php

@@ -54,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $paths = [Config::get(Config::PLUGINS_DIR) . '/orangehrmCorePlugin/Controller/Rest/V2'];
         foreach (Config::get(Config::PLUGIN_PATHS) as $pluginAbsPath) {
             $pathToApiDir = realpath($pluginAbsPath . '/Api');
-            if ($pathToApiDir !== false && !str_ends_with($pathToApiDir, 'src/plugins/orangehrmClaimPlugin/Api')) {
+            if ($pathToApiDir !== false) {
                 $paths[] = $pathToApiDir;
             }
         }

installer/Util/AppSetupUtility.php

@@ -66,7 +66,10 @@ class AppSetupUtility
         '5.1' => \OrangeHRM\Installer\Migration\V5_1_0\Migration::class,
         '5.2' => \OrangeHRM\Installer\Migration\V5_2_0\Migration::class,
         '5.3' => \OrangeHRM\Installer\Migration\V5_3_0\Migration::class,
-        '5.4' => \OrangeHRM\Installer\Migration\V5_4_0\Migration::class,
+        '5.4' => [
+            \OrangeHRM\Installer\Migration\V5_4_0\Migration::class,
+            \OrangeHRM\Installer\Migration\V5_5_0\Migration::class,
+        ],
     ];
 
     public const INSTALLATION_DB_TYPE_NEW = 'new';

phpunit.xml

@@ -72,6 +72,9 @@
     <testsuite name="Buzz">
       <directory>src/plugins/orangehrmBuzzPlugin/test</directory>
     </testsuite>
+    <testsuite name="Claim">
+      <directory>src/plugins/orangehrmClaimPlugin/test</directory>
+    </testsuite>
     <testsuite name="Help">
       <directory>src/plugins/orangehrmHelpPlugin/test</directory>
     </testsuite>

src/client/src/pages.ts

@@ -33,6 +33,7 @@ import languagePages from '@/orangehrmAdminPlugin';
 import dashboardPages from '@/orangehrmDashboardPlugin';
 import buzzPages from '@/orangehrmBuzzPlugin';
 import systemCheckPages from '@/orangehrmSystemCheckPlugin';
+import claimPages from '@/orangehrmClaimPlugin';
 
 export default {
   ...AdminPages,
@@ -52,4 +53,5 @@ export default {
   ...dashboardPages,
   ...buzzPages,
   ...systemCheckPages,
+  ...claimPages,
 };

src/composer.json

@@ -79,6 +79,7 @@
             "OrangeHRM\\LDAP\\": "./plugins/orangehrmLDAPAuthenticationPlugin",
             "OrangeHRM\\SystemCheck\\": "./plugins/orangehrmSystemCheckPlugin",
             "OrangeHRM\\Mobile\\": "./plugins/orangehrmMobilePlugin",
+            "OrangeHRM\\Claim\\": "./plugins/orangehrmClaimPlugin",
             "OrangeHRM\\Installer\\": "../installer",
             "OrangeHRM\\Entity\\": [
                 "./plugins/orangehrmAdminPlugin/entity",
@@ -94,7 +95,8 @@
                 "./plugins/orangehrmRecruitmentPlugin/entity",
                 "./plugins/orangehrmCorporateBrandingPlugin/entity",
                 "./plugins/orangehrmLDAPAuthenticationPlugin/entity",
-                "./plugins/orangehrmBuzzPlugin/entity"
+                "./plugins/orangehrmBuzzPlugin/entity",
+                "./plugins/orangehrmClaimPlugin/entity"
             ]
         }
     },
@@ -119,7 +121,8 @@
             "OrangeHRM\\Tests\\LDAP\\": "./plugins/orangehrmLDAPAuthenticationPlugin/test",
             "OrangeHRM\\Tests\\Buzz\\": "./plugins/orangehrmBuzzPlugin/test",
             "OrangeHRM\\Tests\\Help\\": "./plugins/orangehrmHelpPlugin/test",
-            "OrangeHRM\\Tests\\Mobile\\": "./plugins/orangehrmMobilePlugin/test"
+            "OrangeHRM\\Tests\\Mobile\\": "./plugins/orangehrmMobilePlugin/test",
+            "OrangeHRM\\Tests\\Claim\\": "./plugins/orangehrmClaimPlugin/test"
         }
     },
     "scripts": {

src/plugins/orangehrmCorePlugin/test/Service/MenuServiceTest.php

@@ -174,6 +174,12 @@ public function testGetMenuItemsForAdmin(): void
                 'url' => '/maintenance/viewMaintenanceModule',
                 'icon' => 'maintenance',
             ],
+            [
+                'id' => 105,
+                'name' => 'Claim',
+                'url' => '/claim/viewClaimModule',
+                'icon' => 'claim',
+            ],
             [
                 'id' => 101,
                 'name' => 'Buzz',
@@ -433,6 +439,12 @@ public function testGetMenuItemsForSupervisor(): void
                 'url' => '/directory/viewDirectory',
                 'icon' => 'directory',
             ],
+            [
+                'id' => 105,
+                'name' => 'Claim',
+                'url' => '/claim/viewClaimModule',
+                'icon' => 'claim'
+            ],
             [
                 'id' => 101,
                 'name' => 'Buzz',