bump

.github/workflows/js_template.yml

@@ -0,0 +1,73 @@
+name: CI
+
+on:
+  workflow_call:
+    secrets:
+      GH_TOKEN:
+        required: true
+      GH_PAT:
+        required: true
+      CODECOV_TOKEN:
+        required: true
+
+jobs:
+  codestyle-tests:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'NO_CI')"
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@main
+      with:
+        fetch-depth: 1
+    - name: Checkout Build Repository
+      uses: actions/checkout@main
+      with:
+          fetch-depth: 1
+          ref: develop
+          repository: Karaka-Management/Build
+          path: Build
+    - name: Install NPM
+      uses: actions/setup-node@v3
+      with:
+        node-version: '14'
+        cache: 'npm'
+    - run: npm install
+    - name: eslint
+      run: npx eslint ./ -c Build/Config/.eslintrc.json --fix
+    - name: Check for modified files
+      if: always()
+      id: git-format-check
+      run: echo "modified=$(if git diff-index -G --quiet HEAD --; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT
+    - name: Push changes
+      if: steps.git-format-check.outputs.modified == 'true'
+      run: |
+        git config --global user.name 'Formatter Bot'
+        git config --global user.email '[email protected]'
+        git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
+        git commit -am "Automated formatting changes (NO_CI)"
+        git push
+  code-tests:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'NO_CI')"
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@main
+      with:
+        fetch-depth: 1
+    - name: Checkout Build Repository
+      uses: actions/checkout@main
+      with:
+          fetch-depth: 1
+          ref: develop
+          repository: Karaka-Management/Build
+          path: Build
+    - name: Install NPM
+      uses: actions/setup-node@v3
+      with:
+        node-version: '14'
+        cache: 'npm'
+    - run: npm install
+    - name: jasmine
+      run: |
+        Build/Config/jasmine_build.sh
+        npx jasmine --config=Build/Config/jasmine.json

.github/workflows/main.yml

@@ -114,6 +114,16 @@ jobs:
       run: composer install
     - name: phpunit
       run: vendor/bin/phpunit --coverage-clover tests/coverage.xml --configuration tests/phpunit_no_coverage.xml
+    - name: Install NPM
+      uses: actions/setup-node@v3
+      with:
+        node-version: '14'
+        cache: 'npm'
+    - run: npm install
+    - name: jasmine
+      run: |
+        Build/Config/jasmine_build.sh
+        npx jasmine --config=Build/Config/jasmine.json
   cpp-tests:
     if: "!contains(github.event.head_commit.message, 'NO_CI')"
     strategy:
@@ -220,25 +230,6 @@ jobs:
     - run: npm install
     - name: eslint
       run: npx eslint ./jsOMS -c Build/Config/.eslintrc.json
-  # linting:
-  #   runs-on: ubuntu-latest
-  #   if: "!contains(github.event.head_commit.message, 'NO_CI')"
-  #   strategy:
-  #     fail-fast: false
-  #     max-parallel: 3
-  #   steps:
-  #   - name: Checkout Repository
-  #     uses: actions/checkout@main
-  #     with:
-  #       fetch-depth: 0
-  #       submodules: recursive
-  #       token: ${{ secrets.GH_PAT }}
-  #   - name: Lint Code Base
-  #     uses: github/super-linter/slim@v4
-  #     env:
-  #       VALIDATE_ALL_CODEBASE: false
-  #       DEFAULT_BRANCH: develop
-  #       GITHUB_TOKEN: ${{ secrets.GH_PAT }}
   custom:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'NO_CI')"

Cli/Hooks.php

@@ -5,9 +5,4 @@
             1 => '\Modules\Media\Controller\CliController:runEncryptionChangeFromHook',
         ],
     ],
-    '/.*/' => [
-        'callback' => [
-            0 => '\Modules\Workflow\Controller\CliController:runWorkflowFromHook',
-        ],
-    ],
 ];

Cli/Routes.php

@@ -29,33 +29,4 @@
             'verb' => 16,
         ],
     ],
-    '^.*/workflow/instance( .*$|$)' => [
-        0 => [
-            'dest' => '\Modules\Workflow\Controller\CliController:cliWorkflowInstanceCreate',
-            'verb' => 16,
-        ],
-    ],
-    '^/billing/bill/purchase/parse( .*$|$)' => [
-        0 => [
-            'dest' => '\Modules\Billing\Controller\CliController:cliParseSupplierBill',
-            'verb' => 16,
-        ],
-    ],
-    '^/purchase/order/suggestion/create( .*$|$)' => [
-        0 => [
-            'dest' => '\Modules\Purchase\Controller\CliController:cliGenerateOrderSuggestion',
-            'verb' => 16,
-        ],
-    ],
-    '^.*/orw/check -i all*$' => [
-        0 => [
-            'dest' => '\Modules\OnlineResourceWatcher\Controller\ApiController:apiCheckResources',
-            'active' => true,
-            'permission' => [
-                'module' => 'OnlineResourceWatcher',
-                'type' => 4,
-                'state' => 1,
-            ],
-        ],
-    ],
 ];

Install/Application/Backend/Admin/Install/Application/Pages/PrivacyPolicy/en.md

@@ -12,7 +12,7 @@ For the purposes of these POLICIES:
 * TERMS, POLICIES or AGREEMENT mean these terms that form the entire agreement between You and the COMPANY regarding the use of the SERVICE.
 * Third-party Social Media Service means any services or content (including data, information, products or services) provided by a third-party that may be displayed, included or made available by the SERVICES.
 * WEBSITE refers to all websites owned by jingga
-* APPLICATION refers to all downloadable or installable content which can therfore be used on a given DEVICE.
+* APPLICATION refers to all downloadable or installable content which can therefore be used on a given DEVICE.
 * You means the individual accessing or using the SERVICES, or the company, or other legal entity on behalf of which such individual is accessing or using the SERVICE, as applicable.
 
 ## What is personal data?

Install/Application/Backend/Admin/Install/Application/Pages/Terms/en.md

@@ -12,7 +12,7 @@ For the purposes of these TERMS:
 * TERMS, POLICIES or AGREEMENT mean these terms that form the entire agreement between You and the COMPANY regarding the use of the SERVICE.
 * Third-party Social Media Service means any services or content (including data, information, products or services) provided by a third-party that may be displayed, included or made available by the SERVICES.
 * WEBSITE refers to all websites owned by jingga
-* APPLICATION refers to all downloadable or installable content which can therfore be used on a given DEVICE.
+* APPLICATION refers to all downloadable or installable content which can therefore be used on a given DEVICE.
 * You means the individual accessing or using the SERVICES, or the company, or other legal entity on behalf of which such individual is accessing or using the SERVICE, as applicable.
 
 ## Acknowledgement

Install/Application/Backend/login.tpl.php

@@ -33,7 +33,7 @@
                 <label for="iPassword"><?= $this->getHtml('Password', '0', '0'); ?>:</label>
                 <div class="inputWithIcon">
                     <i class="frontIco g-icon" aria-hidden="true">lock</i>
-                    <input id="iPassword" type="password" name="pass" tabindex="2" value="orange">
+                    <input id="iPassword" type="password" name="pass" tabindex="2" value="">
                     <i class="endIco g-icon" aria-hidden="true">close</i>
                 </div>
                 <input id="iLoginButton" name="loginButton" type="submit" value="<?= $this->getHtml('Login', '0', '0'); ?>" tabindex="3">

Install/InstallAbstract.php

@@ -229,6 +229,7 @@ protected static function installCore(ApplicationAbstract $app) : void
         $toInstall = [
             'Admin',
             'Auditor',
+            'Monitoring',
         ];
 
         $module     = $app->moduleManager->get('Admin', 'Api');

Install/index.tpl.php

@@ -345,10 +345,50 @@
 import { jsOMS } from '../jsOMS/Utils/oLib.js';
 import { ResponseManager } from '../jsOMS/Message/Response/ResponseManager.js';
 import { EventManager } from '../jsOMS/Event/EventManager.js'
+import { UIManager } from '../jsOMS/UI/UIManager.js'
 import { Form } from '../jsOMS/UI/Component/Form.js'
 import { redirectMessage } from '../jsOMS/Model/Action/Dom/Redirect.js';
 import { Logger } from '../jsOMS/Log/Logger.js';
 
+export class Application {
+    constructor ()
+    {
+        this.logger   = Logger.getInstance(true, false, false);
+        window.logger = this.logger;
+
+        this.responseManager = new ResponseManager()
+        this.eventManager = new EventManager();
+        this.uiManager       = new UIManager(this);
+        this.responseManager.add('redirect', redirectMessage);
+
+        this.uiManager.formManager.bind('installForm');
+        this.uiManager.formManager.get('installForm').injectSubmit(function(e) {
+            const valid = e.isValid();
+
+            if (valid) {
+                document.getElementsByTagName('main')[0].setAttribute(
+                    'style',
+                    'margin-left: ' + (5 * -100) + '%;'
+                );
+
+                window.omsApp.eventManager.trigger(e.id);
+            } else {
+                window.alert('You didn\'t fill out all required configuration fields. Please check your settings also on the previous pages.');
+            }
+
+            return valid;
+        });
+
+        this.uiManager.formManager.get('installForm').setSuccess(function(e) {
+            window.location.replace('http://'
+                + document.getElementById('iDomain').value
+                + jsOMS.rtrim(document.getElementById('iWebSubdir').value, '/')
+                + '/backend'
+            );
+        });
+    }
+};
+
 jsOMS.ready(function ()
 {
     /* navigation */
@@ -379,38 +419,6 @@
         });
     }
 
-    /* setup App */
-    const app = {
-        responseManager: new ResponseManager(),
-        eventManager: new EventManager()
-    };
-
-    app.responseManager.add('redirect', redirectMessage);
-
-    const formManager = new Form(app),
-        logger        = Logger.getInstance();
-
-    window.logger = logger;
-    formManager.bind('installForm');
-    formManager.get('installForm').injectSubmit(function(e) {
-        const valid = e.isValid();
-
-        if (valid) {
-            document.getElementsByTagName('main')[0].setAttribute(
-                'style',
-                'margin-left: ' + (5 * -100) + '%;'
-            );
-
-            app.eventManager.trigger(e.id);
-        } else {
-            window.alert('You didn\'t fill out all required configuration fields. Please check your settings also on the previous pages.');
-        }
-
-        return valid;
-    });
-
-    formManager.get('installForm').setSuccess(function(e) {
-        window.location.replace('http://' + document.getElementById('iDomain').value + document.getElementById('iWebSubdir').value + '/backend');
-    });
+    window.omsApp = new Application();
 });
 </script>