Merge branch 'main' into kie-issues#1481

apache · Oct 17, 2024 · ea8b90d · ea8b90d
2 parents 701367e + b005b4a
commit ea8b90d
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 79 deletions.
diff --git a/DISCLAIMER → DISCLAIMER-WIP b/DISCLAIMER → DISCLAIMER-WIP
diff --git a/packages/boxed-expression-component/package.json b/packages/boxed-expression-component/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build:dev": "rimraf dist && pnpm copy:css && tsc -p tsconfig.json",
     "build:prod": "rimraf dist && pnpm copy:css && pnpm lint && tsc -p tsconfig.json && pnpm test && pnpm test-e2e",
-    "build:storybook": "storybook build -o dist-storybook",
+    "build:storybook": "rimraf dist-storybook && NODE_ENV=development storybook build -o dist-storybook",
     "copy:css": "copyfiles -u 1 \"src/**/*.{sass,scss,css}\" dist/",
     "deploy": "gh-pages -d dist-dev",
     "lint": "run-script-if --bool \"$(build-env linters.run)\" --then \"kie-tools--eslint ./src\"",

diff --git a/packages/dmn-editor/package.json b/packages/dmn-editor/package.json
@@ -19,7 +19,7 @@
   "scripts": {
     "build:dev": "rimraf dist && pnpm copy:css && tsc -p tsconfig.json",
     "build:prod": "rimraf dist && pnpm copy:css && pnpm lint && tsc -p tsconfig.json && pnpm test-e2e && pnpm test",
-    "build:storybook": "storybook build -o dist-storybook",
+    "build:storybook": "rimraf dist-storybook && NODE_ENV=development storybook build -o dist-storybook",
     "copy:css": "copyfiles -u 1 \"src/**/*.{sass,scss,css}\" dist/",
     "lint": "run-script-if --bool \"$(build-env linters.run)\" --then \"kie-tools--eslint ./src\"",
     "start": "run-script-os",

diff --git a/packages/jbpm-quarkus-devui/dev/pom.xml b/packages/jbpm-quarkus-devui/dev/pom.xml
@@ -174,58 +174,6 @@
         <directory>src/main/resources</directory>
       </resource>
     </resources>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.commons</groupId>
-              <artifactId>commons-compress</artifactId>
-            </dependency>
-            <dependency>
-              <groupId>org.iq80.snappy</groupId>
-              <artifactId>snappy</artifactId>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.commons</groupId>
-              <artifactId>commons-compress</artifactId>
-            </dependency>
-            <dependency>
-              <groupId>org.iq80.snappy</groupId>
-              <artifactId>snappy</artifactId>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <dependencies>
-            <dependency>
-              <groupId>org.iq80.snappy</groupId>
-              <artifactId>snappy</artifactId>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <dependencies>
-            <dependency>
-              <groupId>org.iq80.snappy</groupId>
-              <artifactId>snappy</artifactId>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.commons</groupId>
-              <artifactId>commons-compress</artifactId>
-            </dependency>
-          </dependencies>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>

diff --git a/packages/runtime-tools-swf-gateway-api/src/gatewayApi/apis.tsx b/packages/runtime-tools-swf-gateway-api/src/gatewayApi/apis.tsx
@@ -729,3 +729,22 @@ export const saveFormContent = (formName: string, content: FormContent): Promise
       .catch((error) => reject(error));
   });
 };
+
+export async function verifyDataIndex(dataIndexUrl?: string): Promise<boolean> {
+  if (!dataIndexUrl) {
+    return false;
+  }
+
+  try {
+    const response = await fetch(dataIndexUrl, {
+      headers: {
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+      body: '{"query":""}',
+    });
+    return response.status === 200;
+  } catch (e) {
+    return false;
+  }
+}
diff --git a/packages/scesim-editor/package.json b/packages/scesim-editor/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "build:dev": "rimraf dist && tsc -p tsconfig.json",
     "build:prod": "rimraf dist && pnpm lint && tsc -p tsconfig.json && pnpm test-e2e",
-    "build:storybook": "storybook build -o dist-storybook",
+    "build:storybook": "rimraf dist-storybook && NODE_ENV=development storybook build -o dist-storybook",
     "lint": "run-script-if --bool \"$(build-env linters.run)\" --then \"kie-tools--eslint ./src\"",
     "powershell": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command",
     "start": "run-script-os",

diff --git a/packages/serverless-logic-web-tools/src/i18n/AppI18n.ts b/packages/serverless-logic-web-tools/src/i18n/AppI18n.ts
@@ -105,6 +105,12 @@ interface AppDictionary extends ReferenceDictionary {
       dependencyWarningTooltip: string;
     };
   };
+  RuntimeToolsSettings: {
+    configModal: {
+      validDataIndexURLError: string;
+      dataIndexConnectionError: string;
+    };
+  };
 }
 
 export interface AppI18n extends AppDictionary, CommonI18n {}
diff --git a/packages/serverless-logic-web-tools/src/i18n/locales/de.ts b/packages/serverless-logic-web-tools/src/i18n/locales/de.ts
@@ -112,4 +112,10 @@ export const de: AppI18n = {
         "Modelle in diesem Arbeitsbereich können von Bereitstellungen aus anderen Arbeitsbereichen abhängen.",
     },
   },
+  RuntimeToolsSettings: {
+    configModal: {
+      validDataIndexURLError: "Bitte geben Sie eine gültige Datenindex-URL ein.",
+      dataIndexConnectionError: "Verbindung abgelehnt. Bitte überprüfen Sie die bereitgestellten Informationen.",
+    },
+  },
 };
diff --git a/packages/serverless-logic-web-tools/src/i18n/locales/en.ts b/packages/serverless-logic-web-tools/src/i18n/locales/en.ts
@@ -108,4 +108,10 @@ export const en: AppI18n = {
       dependencyWarningTooltip: "Models in this workspace may depend on deployments from other workspaces.",
     },
   },
+  RuntimeToolsSettings: {
+    configModal: {
+      validDataIndexURLError: "Please enter a valid Data Index URL.",
+      dataIndexConnectionError: "Connection refused. Please check the information provided.",
+    },
+  },
 };
diff --git a/packages/serverless-logic-web-tools/src/settings/runtimeTools/RuntimeToolsSettings.tsx b/packages/serverless-logic-web-tools/src/settings/runtimeTools/RuntimeToolsSettings.tsx
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import React from "react";
+import React, { useEffect } from "react";
 import { Button, ButtonVariant } from "@patternfly/react-core/dist/js/components/Button";
 import { EmptyState, EmptyStateBody, EmptyStateIcon } from "@patternfly/react-core/dist/js/components/EmptyState";
-import { ActionGroup, Form, FormGroup } from "@patternfly/react-core/dist/js/components/Form";
+import { ActionGroup, Form, FormAlert, FormGroup } from "@patternfly/react-core/dist/js/components/Form";
 import { InputGroup, InputGroupText } from "@patternfly/react-core/dist/js/components/InputGroup";
 import { Modal, ModalVariant } from "@patternfly/react-core/dist/js/components/Modal";
 import { PageSection } from "@patternfly/react-core/dist/js/components/Page";
@@ -43,14 +43,31 @@ import {
   saveConfigCookie,
 } from "./RuntimeToolsConfig";
 import { removeTrailingSlashFromUrl } from "../../url";
+import { isDataIndexUrlValid } from "../../url";
+import { Alert } from "@patternfly/react-core/dist/js";
+import { useAppI18n } from "../../i18n";
+import { verifyDataIndex } from "@kie-tools/runtime-tools-swf-gateway-api/src/gatewayApi/apis";
 
 const PAGE_TITLE = "Runtime Tools";
 
+enum FormValiationOptions {
+  INITIAL = "INITIAL",
+  INVALID = "INVALID",
+  CONNECTION_ERROR = "CONNECTION_ERROR",
+}
+
 export function RuntimeToolsSettings(props: SettingsPageProps) {
+  const { i18n } = useAppI18n();
   const settings = useSettings();
   const settingsDispatch = useSettingsDispatch();
   const [config, setConfig] = useState(settings.runtimeTools.config);
   const [isModalOpen, setIsModalOpen] = useState(false);
+  const [isConfigValidated, setConfigValidated] = useState(FormValiationOptions.INITIAL);
+  const [dataIndexUrlAvailable, setDataIndexUrlAvailable] = useState<boolean>(false);
+
+  useEffect(() => {
+    setConfigValidated(FormValiationOptions.INITIAL);
+  }, [config]);
 
   const handleModalToggle = useCallback(() => {
     setIsModalOpen((prevIsModalOpen) => !prevIsModalOpen);
@@ -76,10 +93,23 @@ export function RuntimeToolsSettings(props: SettingsPageProps) {
     resetConfigCookie();
   }, [settingsDispatch.runtimeTools]);
 
-  const onApply = useCallback(() => {
+  const onApply = useCallback(async () => {
     const newConfig: RuntimeToolsSettingsConfig = {
       dataIndexUrl: removeTrailingSlashFromUrl(config.dataIndexUrl),
     };
+    const isDataIndexUrlVerified = await verifyDataIndex(config.dataIndexUrl);
+    if (!isDataIndexUrlValid(config.dataIndexUrl)) {
+      setConfigValidated(FormValiationOptions.INVALID);
+      return;
+    } else {
+      if (isDataIndexUrlVerified == true) {
+        setDataIndexUrlAvailable(true);
+      } else {
+        setConfigValidated(FormValiationOptions.CONNECTION_ERROR);
+        return;
+      }
+    }
+
     setConfig(newConfig);
     settingsDispatch.runtimeTools.setConfig(newConfig);
     saveConfigCookie(newConfig);
@@ -144,6 +174,28 @@ export function RuntimeToolsSettings(props: SettingsPageProps) {
           appendTo={props.pageContainerRef.current || document.body}
         >
           <Form>
+            {isConfigValidated === FormValiationOptions.INVALID && (
+              <FormAlert>
+                <Alert
+                  variant="danger"
+                  title={i18n.RuntimeToolsSettings.configModal.validDataIndexURLError}
+                  aria-live="polite"
+                  isInline
+                  data-testid="alert-data-index-url-invalid"
+                />
+              </FormAlert>
+            )}
+            {isConfigValidated === FormValiationOptions.CONNECTION_ERROR && (
+              <FormAlert>
+                <Alert
+                  variant="danger"
+                  title={i18n.RuntimeToolsSettings.configModal.dataIndexConnectionError}
+                  aria-live="polite"
+                  isInline
+                  data-testid="alert-data-index-url-connection-error"
+                />
+              </FormAlert>
+            )}
             <FormGroup
               label={"Data Index URL"}
               labelIcon={

diff --git a/packages/serverless-logic-web-tools/src/url/index.ts b/packages/serverless-logic-web-tools/src/url/index.ts
@@ -26,3 +26,12 @@
 export function removeTrailingSlashFromUrl(url: string): string {
   return url.replace(/\/$/, "");
 }
+
+export function isDataIndexUrlValid(url: string): boolean {
+  try {
+    const parsedUrl = new URL(url);
+    return parsedUrl.protocol === "http:" || parsedUrl.protocol === "https:";
+  } catch (_) {
+    return false;
+  }
+}
diff --git a/packages/serverless-logic-web-tools/tests/url/dataIndexValidUrl.test.ts b/packages/serverless-logic-web-tools/tests/url/dataIndexValidUrl.test.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { isDataIndexUrlValid } from "../../src/url";
+
+describe("isDataIndexUrlValid", () => {
+  it.each([
+    ["http://example.com", true],
+    ["http://example.com/", true],
+    ["https://example.com/", true],
+    ["ftps://example.com/", false],
+  ])("the data index URL %s validation should be %s", (inputUrl, isValidUrl) => {
+    expect(isDataIndexUrlValid(inputUrl)).toBe(isValidUrl);
+  });
+});
diff --git a/packages/sonataflow-deployment-webapp/src/context/AppContextProvider.tsx b/packages/sonataflow-deployment-webapp/src/context/AppContextProvider.tsx
@@ -19,9 +19,10 @@
 
 import React, { PropsWithChildren, useEffect, useMemo, useState } from "react";
 import { DEFAULT_APPDATA_VALUES } from "../AppConstants";
-import { AppData, verifyDataIndex } from "../data";
+import { AppData } from "../data";
 import { useAppDataPromise } from "../hooks/useAppDataPromise";
 import { AppContext } from "./AppContext";
+import { verifyDataIndex } from "@kie-tools/runtime-tools-swf-gateway-api/src/gatewayApi/apis";
 
 export function AppContextProvider(props: PropsWithChildren<{}>) {
   const appDataPromise = useAppDataPromise();

diff --git a/packages/sonataflow-deployment-webapp/src/data/index.ts b/packages/sonataflow-deployment-webapp/src/data/index.ts
@@ -29,22 +29,3 @@ export async function fetchAppData(): Promise<AppData> {
   const response = await fetch(routes.dataJson.path({}));
   return (await response.json()) as AppData;
 }
-
-export async function verifyDataIndex(dataIndexUrl?: string): Promise<boolean> {
-  if (!dataIndexUrl) {
-    return false;
-  }
-
-  try {
-    const response = await fetch(dataIndexUrl, {
-      headers: {
-        "Content-Type": "application/json",
-      },
-      method: "POST",
-      body: '{"query":""}',
-    });
-    return response.status === 200;
-  } catch (e) {
-    return false;
-  }
-}
diff --git a/packages/storybook-base/src/config/baseConfig.ts b/packages/storybook-base/src/config/baseConfig.ts
@@ -60,7 +60,9 @@ export const baseConfig: (
       path.dirname(require.resolve("@storybook/addon-webpack5-compiler-babel/package.json")),
     ],
     webpackFinal: async (config) => {
-      return merge(config, common);
+      // Preserve Storybook output configurations
+      const commonConfig = { ...common, output: undefined };
+      return merge(config, commonConfig);
     },
   };
 };