Auth/SessionReminder: Got rid of jQuery

.eslintrc.json

@@ -9,14 +9,7 @@
     // globals from the browser environment.
     "document": "readonly",
     "window": "readonly",
-    "il": "writable",
-    // globals from the mocha testing framework.
-    "beforeEach": "readonly",
-    "afterEach": "readonly",
-    "describe": "readonly",
-    "before": "readonly",
-    "after": "readonly",
-    "it": "readonly"
+    "il": "writable"
   },
   // minified and bundled scripts are exempt from the
   // code-style.

.github/workflows/checks.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.3, 8.4]
-        nodejs: [ 20.x ]
+        nodejs: [ 23.x ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
           GHRUN: "yes"
 
       - name: JS Unit Test
-        run: exit 0 # npm test
+        run: npm test
         env:
           GHRUN: "yes"
 

components/ILIAS/AccessControl/classes/Setup/class.ilAccessRBACSetupAgent.php

@@ -18,27 +18,33 @@
 
 declare(strict_types=1);
 
-use ILIAS\Setup;
+use ILIAS\AccessControl\Setup\AccessControl10DBUpdateSteps;
+use ILIAS\Setup\Agent\NullAgent;
+use ILIAS\Setup\Objective;
 use ILIAS\Setup\Config;
+use ILIAS\Setup\Metrics\Storage;
 
 /**
  * @author  Tim Schmitz <schmitz@leifos.de>
  */
-class ilAccessRBACSetupAgent extends Setup\Agent\NullAgent
+class ilAccessRBACSetupAgent extends NullAgent
 {
     /**
      * @inheritdoc
      */
-    public function getUpdateObjective(?Setup\Config $config = null): Setup\Objective
+    public function getUpdateObjective(Config $config = null): Objective
     {
-        return new ilDatabaseUpdateStepsExecutedObjective(new ilAccessRBACDeleteDbkSteps());
+        return new ilDatabaseUpdateStepsExecutedObjective(new AccessControl10DBUpdateSteps());
     }
 
     /**
      * @inheritdoc
      */
-    public function getStatusObjective(Setup\Metrics\Storage $storage): Setup\Objective
+    public function getStatusObjective(Storage $storage): Objective
     {
-        return new ilDatabaseUpdateStepsMetricsCollectedObjective($storage, new ilAccessRBACDeleteDbkSteps());
+        return new ilDatabaseUpdateStepsMetricsCollectedObjective(
+            $storage,
+            new AccessControl10DBUpdateSteps()
+        );
     }
 }

components/ILIAS/UICore/classes/class.ilUIFramework.php → components/ILIAS/AccessControl/src/Setup/AccessControl10DBUpdateSteps.php

@@ -18,23 +18,21 @@
 
 declare(strict_types=1);
 
-/**
- * @author Alex Killing <alex.killing@gmx.de>
- * @author Thibeau Fuhrer <thibeau@sr.solutions>
- */
-class ilUIFramework
+namespace ILIAS\AccessControl\Setup;
+
+class AccessControl10DBUpdateSteps implements \ilDatabaseUpdateSteps
 {
-    public const BOOTSTRAP_JS = "./assets/js/bootstrap.min.js";
+    protected \ilDBInterface $db;
 
-    public static function init(?ilGlobalTemplateInterface $template = null): void
+    public function prepare(\ilDBInterface $db): void
     {
-        global $DIC;
+        $this->db = $db;
+    }
 
-        $template = $template ?? $DIC->ui()->mainTemplate();
-        $template->addJavaScript(
-            self::BOOTSTRAP_JS,
-            true,
-            0
-        );
+    public function step_1(): void
+    {
+        if (!$this->db->indexExistsByFields('rbac_templates', ['type', 'ops_id'])) {
+            $this->db->addIndex('rbac_templates', ['type', 'ops_id'], 'toi');
+        }
     }
 }

components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordGUI.php

@@ -341,7 +341,7 @@ public function writeEditForm(?int $a_obj_id = null, ?int $a_sub_id = null): boo
      */
     private function parseSearch(): void
     {
-        // this is NOT used for the global search, see ilLuceneAdvancedSearchFields::getFormElement()
+        // this is NOT used for the global search
         // (so searchable flag is NOT relevant)
         //
         // current usage: wiki page element "[amd] page list"

components/ILIAS/App/tests/RootFolderTest.php

@@ -25,11 +25,9 @@
 final class RootFolderTest extends TestCase
 {
     private const array ALLOWED_ROOT_FOLDER_FILES = [
-        '.babelrc.json',
         '.eslintrc.json',
         '.gitignore',
         '.htaccess',
-        '.mocharc.json',
         '.phpunit.result.cache',
         'captainhook.local.json',
         'phpstan.local.neon',
@@ -60,7 +58,6 @@ final class RootFolderTest extends TestCase
         'artifacts',
         'cli',
         'components',
-        'Customizing',
         'docs',
         'extern',
         'lang',

components/ILIAS/Authentication/Authentication.php

@@ -64,8 +64,8 @@ public function offsetUnset(mixed $offset): void
             );
 
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
-            new Component\Resource\Endpoint($this, "sessioncheck.php");
+            new Component\Resource\Endpoint($this, 'sessioncheck.php');
         $contribute[Component\Resource\PublicAsset::class] = fn() =>
-            new Component\Resource\ComponentJS($this, "session_reminder.js");
+            new Component\Resource\ComponentJS($this, 'js/dist/SessionReminder.min.js');
     }
 }

components/ILIAS/Authentication/classes/Cron/class.ilAuthDestroyExpiredSessionsCron.php

@@ -50,17 +50,25 @@ public function getDescription(): string
 
     public function hasAutoActivation(): bool
     {
-        return true;
+        return false;
     }
 
     public function hasFlexibleSchedule(): bool
     {
         return true;
     }
 
+    public function getValidScheduleTypes(): array
+    {
+        return [
+            \ILIAS\Cron\Job\Schedule\JobScheduleType::IN_MINUTES,
+            \ILIAS\Cron\Job\Schedule\JobScheduleType::IN_HOURS
+        ];
+    }
+
     public function getDefaultScheduleType(): \ILIAS\Cron\Job\Schedule\JobScheduleType
     {
-        return \ILIAS\Cron\Job\Schedule\JobScheduleType::IN_HOURS;
+        return \ILIAS\Cron\Job\Schedule\JobScheduleType::IN_MINUTES;
     }
 
     public function getDefaultScheduleValue(): ?int

components/ILIAS/Authentication/classes/class.ilObjAuthSettingsGUI.php

@@ -181,7 +181,12 @@ private function authSettingsObject(
         $page_content = [
             $this->ui_factory->panel()->standard(
                 $this->lng->txt('auth_select'),
-                $this->ui_factory->legacy()->content($generalSettingsTpl->get()),
+                $this->ui_factory->legacy()->content(implode('', [
+                    $this->ui_renderer->render($this->ui_factory->messageBox()->info(
+                        $this->lng->txt('auth_mode_default_change_info')
+                    )),
+                    $generalSettingsTpl->get()
+                ])),
             )
         ];
 

components/ILIAS/Authentication/classes/class.ilSessionReminder.php

@@ -26,24 +26,18 @@ class ilSessionReminder
     public const LEAD_TIME_DISABLED = 0;
     public const MIN_LEAD_TIME = 1;
     public const SUGGESTED_LEAD_TIME = 5;
-    private ClockInterface $clock;
-    private ilObjUser $user;
-    private ilSetting $settings;
+
     private int $lead_time = self::SUGGESTED_LEAD_TIME;
     private int $expiration_time = 0;
     private int $current_time = 0;
     private int $seconds_until_expiration = 0;
     private int $seconds_until_reminder = 0;
 
     public function __construct(
-        ilObjUser $user,
-        ClockInterface $clock,
-        ilSetting $settings
+        private ilObjUser $user,
+        private ClockInterface $clock,
+        private ilSetting $settings
     ) {
-        $this->user = $user;
-        $this->clock = $clock;
-        $this->settings = $settings;
-
         $this->init();
     }
 
@@ -79,10 +73,8 @@ private function buildValidLeadTime(int $lead_time): int
         $min_value = self::MIN_LEAD_TIME;
         $max_value = $this->getMaxPossibleLeadTime();
 
-        if (
-            $lead_time !== self::LEAD_TIME_DISABLED &&
-            ($lead_time < $min_value || $lead_time > $max_value)
-        ) {
+        if ($lead_time !== self::LEAD_TIME_DISABLED &&
+            ($lead_time < $min_value || $lead_time > $max_value)) {
             $lead_time = self::SUGGESTED_LEAD_TIME;
         }