Dirigible 14.17.0 with the OData v2 engine from dirigiblelabs/dirigible-odata

application/pom.xml

@@ -281,10 +281,6 @@
             <groupId>org.eclipse.dirigible</groupId>
             <artifactId>dirigible-components-ui-menu-form-builder</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.dirigible</groupId>
-            <artifactId>dirigible-components-template-form-builder-angularjs</artifactId>
-        </dependency>
         <!--    BPM-->
         <dependency>
             <groupId>org.eclipse.dirigible</groupId>

application/src/main/resources/dirigible.properties

@@ -1,6 +1,10 @@
 # General
 DIRIGIBLE_MULTI_TENANT_MODE=false
 
+# Land on the Workbench IDE, not on the platform's Home launchpad (the 14.16.0+ default is
+# services/web/home/). Kronos is a migration/tooling edition, so the IDE is home.
+DIRIGIBLE_HOME_URL=services/web/shell-ide/
+
 DIRIGIBLE_PRODUCT_NAME=${project.title}
 DIRIGIBLE_PRODUCT_VERSION=${project.version}
 DIRIGIBLE_PRODUCT_COMMIT_ID=${git.commit.id}

core/menu-help/src/main/resources/META-INF/dirigible/menu-help/configs/help.js

@@ -9,69 +9,83 @@
  * SPDX-FileCopyrightText: 2022 codbex or an codbex affiliate company and contributors
  * SPDX-License-Identifier: EPL-2.0
  */
-exports.getMenu = () => ({
-	systemMenu: true,
-	id: 'help',
-	menu: {
-		translation: {
-			key: 'common:help',
-		},
-		label: 'Help',
-		items: [
-			{
-				translation: {
-					key: 'menu-help:portal',
-				},
-				label: 'Help Portal',
-				action: 'open',
-				link: 'https://www.codbex.com/documentation/tooling/',
-				separator: false
+import { repository } from "sdk/platform";
+
+export function getMenu() {
+	const hasOpenApi = repository.getResource('/registry/public/view-swagger/project.json').exists();
+	const config = {
+		systemMenu: true,
+		id: 'help',
+		menu: {
+			translation: {
+				key: 'common:help',
 			},
-			{
-				translation: {
-					key: 'menu-help:support',
+			label: 'Help',
+			items: [
+				{
+					translation: {
+						key: 'menu-help:portal',
+					},
+					label: 'Help Portal',
+					action: 'open',
+					link: 'https://www.codbex.com/documentation/tooling/',
+					separator: false
 				},
-				label: 'Contact Support',
-				action: 'open',
-				link: 'https://www.codbex.com/contact/',
-				separator: false
-			},
-			{
-				translation: {
-					key: 'menu-help:pricing',
+				{
+					translation: {
+						key: 'menu-help:support',
+					},
+					label: 'Contact Support',
+					action: 'open',
+					link: 'https://www.codbex.com/contact/',
+					separator: false
 				},
-				label: 'Pricing Plans',
-				action: 'open',
-				link: 'https://www.codbex.com/pricing/',
-				separator: false
-			},
-			{
-				translation: {
-					key: 'menu-help:whatsNew',
+				{
+					translation: {
+						key: 'menu-help:pricing',
+					},
+					label: 'Pricing Plans',
+					action: 'open',
+					link: 'https://www.codbex.com/pricing/',
+					separator: false
 				},
-				label: 'What\'s New',
-				action: 'open',
-				link: 'https://www.codbex.com/technology',
-				separator: false
-			},
-			{
-				translation: {
-					key: 'menu-help:updates',
+				{
+					translation: {
+						key: 'menu-help:whatsNew',
+					},
+					label: 'What\'s New',
+					action: 'open',
+					link: 'https://www.codbex.com/technology',
+					separator: false
 				},
-				label: 'Check for Updates',
-				action: 'open',
-				link: 'https://www.codbex.com/products/',
-				separator: true
-			},
-			{
-				id: 'about',
-				translation: {
-					key: 'menu-help:about',
+				{
+					translation: {
+						key: 'menu-help:updates',
+					},
+					label: 'Check for Updates',
+					action: 'open',
+					link: 'https://www.codbex.com/products/',
+					separator: true
 				},
-				label: 'About',
-				action: 'openWindow',
-				separator: false
-			}
-		]
+				{
+					id: 'about',
+					translation: {
+						key: 'menu-help:about',
+					},
+					label: 'About',
+					action: 'openWindow',
+					separator: false
+				}
+			]
+		}
+	};
+	if (hasOpenApi) {
+		config.menu.items.splice(5, 0, {
+			label: 'OpenAPI',
+			action: 'open',
+			link: '/services/web/view-swagger/ui/',
+			separator: true
+		});
 	}
-});
+	return config;
+};

core/welcome/src/main/resources/META-INF/dirigible/view-welcome/js/welcome.js

@@ -65,7 +65,7 @@ welcome.controller('WelcomeController', ($scope, $http, WorkspaceService, Templa
                 controlType: 'input',
                 type: 'text',
                 label: template.parameters[i].label,
-                require: true,
+                required: template.parameters[i].required === true,
             };
         }
         return form;

core/welcome/src/main/resources/META-INF/dirigible/view-welcome/welcome.html

@@ -12,8 +12,8 @@
         <script src="js/welcome.js" type="text/javascript"></script>
         <style>
             .imgColor path {
-                background-color: var(--fdAvatarBackgroundColor);
-                fill: var(--fdAvatarColor);
+                background-color: var(--accent);
+                fill: var(--accent-foreground);
             }
 
         </style>
@@ -65,7 +65,7 @@ <h3 class="fd-section__title">Welcome to Kronos</h3>
             <p class="fd-text">You can create server-side scripting services by using the
                 <bk-link href="http://www.codbex.com/documentation/platform/sdk" target="_blank">Enterprise Javascript API</bk-link> or just design your web pages in HTML5 by using your favorite client-side framework.
                 <br>
-                All source code is licensed under the <bk-link href="https://www.eclipse.org/legal/epl-v20.html" target="_blank">Eclipse Public License - v 2.0</bk-link> and maintained at <bk-link href="https://github.com/codbex/codbex-hyperion" target="_blank">GitHub</bk-link>.
+                All source code is licensed under the <bk-link href="https://www.eclipse.org/legal/epl-v20.html" target="_blank">Eclipse Public License - v 2.0</bk-link> and maintained at <bk-link href="https://github.com/codbex/codbex-kronos" target="_blank">GitHub</bk-link>.
             </p>
         </section>
         <theme></theme>

integration-tests/src/test/java/com/codbex/kronos/integration/tests/DirigibleCommonTestSuiteIT.java

@@ -14,7 +14,6 @@
 import org.eclipse.dirigible.integration.tests.api.java.db.SchemaExportImportIT;
 import org.eclipse.dirigible.integration.tests.api.java.messaging.MessagingFacadeIT;
 import org.eclipse.dirigible.integration.tests.api.javascript.cms.CmsSuiteIT;
-import org.eclipse.dirigible.integration.tests.api.rest.ODataAPIIT;
 import org.eclipse.dirigible.integration.tests.ui.tests.*;
 import org.eclipse.dirigible.integration.tests.ui.tests.camel.*;
 import org.junit.platform.suite.api.SelectClasses;
@@ -39,10 +38,8 @@
         DatabasePerspectiveIT.class, //
         DeclineLeaveRequestBpmIT.class, //
         GitPerspectiveIT.class, //
-        HomepageRedirectIT.class, //
         MailIT.class, //
         MessagingFacadeIT.class, //
-        ODataAPIIT.class, //
         SchemaExportImportIT.class, //
         SecurityIT.class, //
         TerminalIT.class//

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codbex.platform</groupId>
         <artifactId>codbex-platform-parent</artifactId>
-        <version>13.6.0</version>
+        <version>14.17.0</version>
     </parent>
 
     <name>codbex - kronos - parent</name>
@@ -34,6 +34,13 @@
     </modules>
 
     <properties>
+        <!--
+            The OData v2 engine left the platform in 14.16.0 (eclipse-dirigible/dirigible#6567) and is
+            published separately from dirigiblelabs/dirigible-odata, so this distribution pins it - and
+            Olingo, which dirigible-dependencies no longer manages - itself.
+        -->
+        <dirigible.odata.version>14.17.0-SNAPSHOT</dirigible.odata.version>
+        <olingo.version>3.1.4</olingo.version>
         <project.title>Kronos by codbex</project.title>
 
         <scmVersionType>branch</scmVersionType>
@@ -161,6 +168,29 @@
     <dependencyManagement>
         <dependencies>
 
+            <!-- Apache Olingo (com.codbex fork), and the extracted OData v2 engine -->
+            <dependency>
+                <groupId>com.codbex.olingo</groupId>
+                <artifactId>olingo-odata2-lib</artifactId>
+                <version>${olingo.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>com.codbex.olingo</groupId>
+                <artifactId>olingo-odata2-core</artifactId>
+                <version>${olingo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.dirigible</groupId>
+                <artifactId>dirigible-odata-core</artifactId>
+                <version>${dirigible.odata.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.dirigible</groupId>
+                <artifactId>dirigible-components-engine-odata</artifactId>
+                <version>${dirigible.odata.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.codbex.kronos</groupId>
                 <artifactId>codbex-kronos-application</artifactId>