add js files as resources

cli/build_bootstrap.php

@@ -29,12 +29,14 @@
 
 INFO;
 
-if (isset($argv[1])) {
-    $resolution_file = $argv[1];
-} else {
-    $resolution_file = realpath(__DIR__ . "/../dependency_resolution.php");
+if (count($argv) !== 3) {
+    die("php cli/build_bootstrap.php \$dependency_resolution \$name");
 }
 
+$resolution_file = $argv[1];
+$name = $argv[2];
+
+
 if (!file_exists($resolution_file)) {
     die("Cannot find resolution file at {$resolution_file}.\n");
 }
@@ -87,4 +89,4 @@
 if (!is_dir(__DIR__ . "/../artifacts")) {
     mkdir(__DIR__ . "/../artifacts", 0755, true);
 }
-file_put_contents(__DIR__ . "/../artifacts/bootstrap.php", $bootstrap);
+file_put_contents(__DIR__ . "/../artifacts/bootstrap_$name.php", $bootstrap);

cli/setup.php

@@ -15,7 +15,7 @@
  *
  *********************************************************************/
 
-require_once(__DIR__ . "/../artifacts/bootstrap.php");
+require_once(__DIR__ . "/../artifacts/bootstrap_setup.php");
 require_once(__DIR__ . "/../ilias_version.php");
 
 exit(entry_point("The ILIAS Setup"));

components/ILIAS/AccessControl/AccessControl.php

@@ -32,6 +32,15 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            new \ilAccessControlSetupAgent(
+                $pull[\ILIAS\Refinery\Factory::class]
+            );
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            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/Administration/Administration.php

@@ -32,6 +32,9 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            new \ILIAS\Administration\Setup\ilAdministrationSetupAgent(
+                $pull[\ILIAS\Refinery\Factory::class]
+            );
     }
 }

components/ILIAS/AdministrativeNotification/classes/Setup/class.ilADNAgent.php

@@ -68,7 +68,7 @@ public function getUpdateObjective(Config $config = null): Setup\Objective
     }
 
 
-    public function getBuildArtifactObjective(): Setup\Objective
+    public function getBuildObjective(): Setup\Objective
     {
         return new Setup\Objective\NullObjective();
     }

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

@@ -32,6 +32,12 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            new \ilAuthenticationSetupAgent(
+                $pull[\ILIAS\Refinery\Factory::class]
+            );
+
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\Endpoint($this, "sessioncheck.php");
     }
 }

components/ILIAS/Authentication/classes/Setup/class.ilAuthenticationSetupAgent.php

@@ -47,7 +47,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective
         );
     }
 
-    public function getBuildArtifactObjective(): Setup\Objective
+    public function getBuildObjective(): Setup\Objective
     {
         return new Setup\Objective\NullObjective();
     }

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,9 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            new \ilBackgroundTasksSetupAgent(
+                $pull[\ILIAS\Refinery\Factory::class]
+            );
     }
 }

components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupAgent.php

@@ -46,7 +46,7 @@ public function hasConfig(): bool
      */
     public function getArrayToConfigTransformation(): Refinery\Transformation
     {
-        return $this->refinery->custom()->transformation(fn ($data): \ilBackgroundTasksSetupConfig => new \ilBackgroundTasksSetupConfig(
+        return $this->refinery->custom()->transformation(fn($data): \ilBackgroundTasksSetupConfig => new \ilBackgroundTasksSetupConfig(
             $data["type"] ?? \ilBackgroundTasksSetupConfig::TYPE_SYNCHRONOUS,
             $data["max_number_of_concurrent_tasks"] ?? 1
         ));
@@ -76,7 +76,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective
     /**
      * @inheritdoc
      */
-    public function getBuildArtifactObjective(): Setup\Objective
+    public function getBuildObjective(): Setup\Objective
     {
         return new Setup\Objective\NullObjective();
     }

components/ILIAS/Bibliographic/Bibliographic.php

@@ -32,6 +32,9 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            new \ilBibliographicSetupAgent(
+                $pull[\ILIAS\Refinery\Factory::class]
+            );
     }
 }

components/ILIAS/Bibliographic/classes/Setup/class.ilBibliographicSetupAgent.php

@@ -74,7 +74,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective
     /**
      * @inheritdoc
      */
-    public function getBuildArtifactObjective(): Setup\Objective
+    public function getBuildObjective(): Setup\Objective
     {
         return new Setup\Objective\NullObjective();
     }

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/COPage/COPage.php

@@ -32,6 +32,14 @@ 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\NodeModule("tinymce/tinymce.js");
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\NodeModule("tinymce/tinymce.min.js");
     }
 }

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.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();

components/ILIAS/Calendar/Calendar.php

@@ -32,6 +32,12 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            new \ilCalendarSetupAgent(
+                $pull[\ILIAS\Refinery\Factory::class]
+            );
+
+        $contribute[Component\Resource\PublicAsset::class] = fn() =>
+            new Component\Resource\Endpoint($this, "calendar.php");
     }
 }

components/ILIAS/Certificate/Certificate.php

@@ -32,6 +32,9 @@ public function init(
         array | \ArrayAccess &$pull,
         array | \ArrayAccess &$internal,
     ): void {
-        // ...
+        $contribute[\ILIAS\Setup\Agent::class] = fn() =>
+            new \ilCertificatSetupAgent(
+                $pull[\ILIAS\Refinery\Factory::class]
+            );
     }
 }

components/ILIAS/Certificate/classes/Setup/class.ilCertificatSetupAgent.php

@@ -47,7 +47,7 @@ public function getUpdateObjective(Setup\Config $config = null): Setup\Objective
         );
     }
 
-    public function getBuildArtifactObjective(): Setup\Objective
+    public function getBuildObjective(): Setup\Objective
     {
         return new Setup\Objective\NullObjective();
     }

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");
     }
 }