Component: build public resources (WIP)

components/ILIAS/AccessControl/AccessControl.php

@@ -40,5 +40,7 @@ public function init(
             new \ilAccessRBACSetupAgent(
                 $pull[\ILIAS\Refinery\Factory::class]
             );
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "ilPermSelect.js");
     }
 }

components/ILIAS/AccessControl/classes/class.ilObjectRolePermissionTableGUI.php

@@ -57,7 +57,7 @@ public function __construct(ilPermissionGUI $a_parent_obj, string $a_parent_cmd,
         $this->tree_path_ids = $this->tree->getPathId($this->ref_id);
 
         $tpl = $DIC->ui()->mainTemplate();
-        $tpl->addJavaScript('./components/ILIAS/AccessControl/js/ilPermSelect.js');
+        $tpl->addJavaScript('assets/js/ilPermSelect.js');
 
         $this->setTitle($this->lng->txt('permission_settings'));
         $this->setEnableHeader(true);

components/ILIAS/Accordion/Accordion.php

@@ -32,6 +32,9 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "accordion.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\NodeModule("owl.carousel/dist/owl.carousel.js");
     }
 }

components/ILIAS/Accordion/classes/class.ilAccordionGUI.php

@@ -254,8 +254,8 @@ public static function addCss(): void
     public static function getLocalJavascriptFiles(): array
     {
         return array(
-            "./components/ILIAS/Accordion/js/accordion.js",
-            self::$owl_path . self::$owl_js_path
+            "assets/js/accordion.js",
+            "assets/js" . self::$owl_js_path
         );
     }
 

components/ILIAS/App/tests/RootFolderTest.php

@@ -44,7 +44,6 @@ final class RootFolderTest extends TestCase
         'composer.json',
         'composer_new.json',
         'composer.lock',
-        'dependency_resolution.php',
         'ilias.ini.php',
         'ilias_version.php',
         'LICENSE',

components/ILIAS/AuthShibboleth/AuthShibboleth.php

@@ -32,6 +32,10 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\Endpoint($this, "shib_login.php");
+
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\Endpoint($this, "shib_logout.php");
     }
 }

public/shib_login.php → components/ILIAS/AuthShibboleth/resources/shib_login.php

@@ -37,4 +37,4 @@
     // @todo: removed deprecated ilCtrl methods, this needs inspection by a maintainer.
     // $DIC->ctrl()->setCmd('doShibbolethAuthentication');
     $DIC->ctrl()->callBaseClass(ilStartUpGUI::class);
-}
+}

public/shib_logout.php → components/ILIAS/AuthShibboleth/resources/shib_logout.php

@@ -167,4 +167,4 @@ function unserializesession($serialized_string)
     }
 
     return ($variables);
-}
+}

components/ILIAS/Authentication/Authentication.php

@@ -36,5 +36,10 @@ public function init(
             new \ilAuthenticationSetupAgent(
                 $pull[\ILIAS\Refinery\Factory::class]
             );
+
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\Endpoint($this, "sessioncheck.php");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "session_reminder.js");
     }
 }

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

@@ -42,7 +42,7 @@ public function populatePage(): void
 
         iljQueryUtil::initjQuery($this->page);
 
-        $this->page->addJavaScript('./components/ILIAS/Authentication/js/session_reminder.js');
+        $this->page->addJavaScript('assets/js/session_reminder.js');
 
         $url = './sessioncheck.php?client_id=' . CLIENT_ID . '&lang=' . $this->lng->getLangKey();
         $devMode = defined('DEVMODE') && DEVMODE ? 1 : 0;

public/sessioncheck.php → components/ILIAS/Authentication/resources/sessioncheck.php

@@ -31,16 +31,16 @@
 /** @var ILIAS\DI\Container $DIC */
 $DIC->http()->saveResponse(
     (
-        new ilSessionReminderCheck(
-            $DIC->http(),
-            $DIC->refinery(),
-            $DIC->language(),
-            $DIC->database(),
-            $DIC['ilClientIniFile'],
-            $DIC->logger()->auth(),
-            (new DataFactory())->clock()->utc()
-        )
+    new ilSessionReminderCheck(
+        $DIC->http(),
+        $DIC->refinery(),
+        $DIC->language(),
+        $DIC->database(),
+        $DIC['ilClientIniFile'],
+        $DIC->logger()->auth(),
+        (new DataFactory())->clock()->utc()
+    )
     )->handle()
 );
 $DIC->http()->sendResponse();
-$DIC->http()->close();
+$DIC->http()->close();

components/ILIAS/Awareness/Awareness.php

@@ -32,6 +32,7 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "Awareness.js");
     }
 }

components/ILIAS/Awareness/classes/class.ilAwarenessGUI.php

@@ -93,7 +93,7 @@ public function initJS(): void
     {
         $ilUser = $this->user;
         // init js
-        $this->main_tpl->addJavaScript("./components/ILIAS/Awareness/js/Awareness.js");
+        $this->main_tpl->addJavaScript("./assets/js/Awareness.js");
         $this->ctrl->setParameter($this, "ref_id", $this->ref_id);
         $this->main_tpl->addOnLoadCode("il.Awareness.setBaseUrl('" . $this->ctrl->getLinkTarget(
             $this,

components/ILIAS/BackgroundTasks_/BackgroundTasks_.php

@@ -32,6 +32,7 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "background_task_refresh.js");
     }
 }

components/ILIAS/BackgroundTasks_/classes/Provider/BTNotificationProvider.php

@@ -39,7 +39,7 @@ public function getNotifications(): array
             return [];
         }
 
-        $this->dic->ui()->mainTemplate()->addJavaScript("./components/ILIAS/BackgroundTasks_/js/background_task_refresh.js");
+        $this->dic->ui()->mainTemplate()->addJavaScript("assets/js/background_task_refresh.js");
         $this->dic->language()->loadLanguageModule('background_tasks');
 
         $id = fn (string $id): IdentificationInterface => $this->if->identifier($id);

components/ILIAS/Block/Block.php

@@ -32,6 +32,7 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "ilblockcallback.js");
     }
 }

components/ILIAS/Block/classes/class.ilBlockGUI.php

@@ -122,7 +122,7 @@ public function __construct()
         $this->ui = $DIC->ui();
 
         ilYuiUtil::initConnection();
-        $this->main_tpl->addJavaScript("./components/ILIAS/Block/js/ilblockcallback.js");
+        $this->main_tpl->addJavaScript("./assets/js/ilblockcallback.js");
 
         $this->setLimit((int) $this->user->getPref("hits_per_page"));
 

components/ILIAS/BookingManager/BookingManager.php

@@ -32,6 +32,7 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "ScheduleInput.js");
     }
 }

components/ILIAS/BookingManager/classes/class.ilScheduleInputGUI.php

@@ -241,7 +241,7 @@ public function insert(ilTemplate $a_tpl): void
     {
         $tpl = $this->tpl;
 
-        $tpl->addJavascript("components/ILIAS/BookingManager/js/ScheduleInput.js");
+        $tpl->addJavascript("assets/js/ScheduleInput.js");
 
         $html = $this->render();
 

components/ILIAS/COPage/COPage.php

@@ -32,6 +32,21 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "ilCOPagePres.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "ilCOPagePCInteractiveImage.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "page_history.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentCSS($this, "content.css");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentCSS($this, "content_base.css");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentCSS($this, "print_content.css");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentCSS($this, "syntaxhighlight.css");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentCSS($this, "tiny_extra.css");
     }
 }

components/ILIAS/COPage/Editor/UI/Init.php

@@ -56,13 +56,13 @@ public function initUI(
         }
 
         if (DEVMODE == 1) {
-            $main_tpl->addJavaScript("./node_modules/tinymce/tinymce.js");
+            $main_tpl->addJavaScript("assets/js/tinymce.js");
         } else {
-            $main_tpl->addJavaScript("./node_modules/tinymce/tinymce.min.js");
+            $main_tpl->addJavaScript("assets/js/tinymce.min.js");
         }
 
         \ilYuiUtil::initConnection();
-        $main_tpl->addJavaScript("./components/ILIAS/UIComponent/Explorer/js/ilExplorer.js");
+        $main_tpl->addJavaScript("assets/js/ilExplorer.js");
 
         // ensure that form.js is loaded which is needed for file input (js that shows file names)
         $dummy = new \ilPropertyFormGUI();

components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerEditorGUI.php

@@ -34,8 +34,8 @@ public function __construct(
         iljQueryUtil::initjQueryUI();
         parent::__construct($a_content_obj, $a_page, $request);
 
-        $this->main_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePres.js");
-        $this->main_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePCInteractiveImage.js");
+        $this->main_tpl->addJavaScript("assets/js/ilCOPagePres.js");
+        $this->main_tpl->addJavaScript("assets/js/ilCOPagePCInteractiveImage.js");
 
         ilAccordionGUI::addJavaScript();
         ilAccordionGUI::addCss();

components/ILIAS/COPage/PC/Table/class.ilPCTableGUI.php

@@ -1033,7 +1033,7 @@ public function editData(): void
         $this->displayValidationError();
 
         $this->initEditor();
-        $this->tpl->addJavaScript("./components/ILIAS/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js");
+        $this->tpl->addJavaScript("assets/js/AdvancedSelectionList.js");
         $this->tpl->addCss(ilObjStyleSheet::getBaseContentStylePath());
         $this->tpl->setContent($this->getEditDataTable(true));
     }

components/ILIAS/COPage/Resources/ResourcesCollector.php

@@ -66,10 +66,10 @@ protected function init(\ilPageObject $pg): void
         if ($this->output_mode == \ilPageObjectGUI::OFFLINE) {
             $this->js_files[] = \iljQueryUtil::getLocaljQueryPath();
             $this->js_files[] = \iljQueryUtil::getLocaljQueryUIPath();
-            $this->js_files[] = './components/ILIAS/JavaScript/js/Basic.js';
+            $this->js_files[] = 'assets/js/Basic.js';
         }
 
-        $this->js_files[] = "./components/ILIAS/COPage/js/ilCOPagePres.js";
+        $this->js_files[] = "assets/js/ilCOPagePres.js";
 
         // for all page components...
         $defs = $this->pc_definition->getPCDefinitions();

components/ILIAS/COPage/classes/class.ilCOPageHTMLExport.php

@@ -132,7 +132,7 @@ public function exportStyles(): void
                 $this->exp_dir . "/" . ilObjStyleSheet::getBasicImageDir()
             );
             ilFileUtils::makeDirParents($this->exp_dir . "/components/ILIAS/COPage/css");
-            copy("components/ILIAS/COPage/css/content.css", $this->exp_dir . "/components/ILIAS/COPage/css/content.css");
+            copy("components/ILIAS/COPage/resources/content.css", $this->exp_dir . "/assets/css/content.css");
         } else {
             $style = new ilObjStyleSheet($this->getContentStyleId());
             $style->copyImagesToDir($this->exp_dir . "/" . $style->getImagesDirectory());

components/ILIAS/COPage/classes/class.ilPageObjectGUI.php

@@ -1077,7 +1077,7 @@ public function showPage(): string
         //		$this->initSelfAssessmentRendering();
         ilObjMediaObjectGUI::includePresentationJS($main_tpl);
 
-        $main_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePres.js");
+        $main_tpl->addJavaScript("assets/js/ilCOPagePres.js");
 
         // needed for overlays in iim
         ilOverlayGUI::initJavascript();
@@ -2429,7 +2429,7 @@ protected function initEditing(): void
         $this->lng->toJS("copg_par_format_selection");
         // workaroun: we need this js for the new editor version, e.g. for new section form to work
         // @todo: solve this in a smarter way
-        $this->tpl->addJavaScript("./components/ILIAS/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js");
+        $this->tpl->addJavaScript("assets/js/AdvancedSelectionList.js");
         \ilCalendarUtil::initDateTimePicker();
         ilModalGUI::initJS();
     }
@@ -2600,7 +2600,7 @@ public function history(): string
 
         $this->setBackToEditTabs();
 
-        $this->tpl->addJavaScript("./components/ILIAS/COPage/js/page_history.js");
+        $this->tpl->addJavaScript("assets/js/page_history.js");
 
         $table_gui = new ilPageHistoryTableGUI($this, "history");
         $table_gui->setId("hist_table");

components/ILIAS/Calendar/Calendar.php

@@ -36,5 +36,18 @@ public function init(
             new \ilCalendarSetupAgent(
                 $pull[\ILIAS\Refinery\Factory::class]
             );
+
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\Endpoint($this, "calendar.php");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "recurrence_input.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "toggle_notification.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "calendar_appointment.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\NodeModule("moment/min/moment-with-locales.min.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\NodeModule("eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js");
     }
 }

components/ILIAS/Calendar/classes/Form/class.ilRecurrenceInputGUI.php

@@ -47,7 +47,7 @@ public function __construct(string $a_title, string $a_postvar)
     {
         global $DIC;
 
-        $DIC->ui()->mainTemplate()->addJavaScript("./components/ILIAS/Calendar/js/recurrence_input.js");
+        $DIC->ui()->mainTemplate()->addJavaScript("assets/js/recurrence_input.js");
         $this->user = $DIC->user();
         $this->user_settings = ilCalendarUserSettings::_getInstanceByUserId($this->user->getId());
         $this->recurrence = new ilCalendarRecurrence();

components/ILIAS/Calendar/classes/class.ilCalendarAppointmentGUI.php

@@ -310,7 +310,7 @@ protected function initForm(string $a_mode, bool $a_edit_single_app = false): il
                 }
             }
 
-            $this->tpl->addJavaScript('./components/ILIAS/Calendar/js/toggle_notification.js');
+            $this->tpl->addJavaScript('assets/js/toggle_notification.js');
             $not = new ilCheckboxInputGUI($this->lng->txt('cal_cg_notification'), 'not');
             $not->setInfo($this->lng->txt('cal_notification_info'));
             $not->setValue('1');

components/ILIAS/Calendar/classes/class.ilCalendarUtil.php

@@ -508,11 +508,11 @@ public static function initDateTimePicker(): void
         $tpl = $DIC->ui()->mainTemplate();
 
         if (!self::$init_datetimepicker) {
-            $tpl->addJavaScript("./node_modules/moment/min/moment-with-locales.min.js");
+            $tpl->addJavaScript("assets/js/moment-with-locales.min.js");
             // unminified version does not work with jQuery 3.0
             // https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1684
-            $tpl->addJavaScript("./node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js");
-            $tpl->addJavaScript("components/ILIAS/Form/js/Form.js"); // see ilPropertyFormGUI
+            $tpl->addJavaScript("assets/js/bootstrap-datetimepicker.min.js");
+            $tpl->addJavaScript("assets/js/Form.js"); // see ilPropertyFormGUI
             self::$init_datetimepicker = true;
         }
     }

components/ILIAS/Calendar/classes/class.ilCalendarViewGUI.php

@@ -95,7 +95,7 @@ public function initialize(int $a_calendar_presentation_type): void
         if ($this->presentation_type == self::CAL_PRESENTATION_DAY ||
             $this->presentation_type == self::CAL_PRESENTATION_WEEK) {
             iljQueryUtil::initjQuery($this->main_tpl);
-            $this->main_tpl->addJavaScript('./components/ILIAS/Calendar/js/calendar_appointment.js');
+            $this->main_tpl->addJavaScript('assets/js/calendar_appointment.js');
         }
         $this->http = $DIC->http();
         $this->refinery = $DIC->refinery();

components/ILIAS/Chart/Chart.php

@@ -32,6 +32,19 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "excanvas.min.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "jquery.flot.min.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "jquery.flot.resize.min.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "jquery.flot.stack.min.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "jquery.flot.pie.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "jquery.flot.highlighter.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\ComponentJS($this, "jquery.flot.spider.js");
     }
 }