Merge branch 'main' into remove-server-context-path

# Conflicts: # packages/jv-scheduler/src/utils/configurationUtils.ts
Jaspersoft · Jan 21, 2025 · 94b11ab · 94b11ab
2 parents a3907cc + cf296f5
commit 94b11ab
Show file tree

Hide file tree

Showing 43 changed files with 6,566 additions and 3,555 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-visualize-components",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "private": true,
   "description": "Jaspersoft Visualize Components",
   "workspaces": {

diff --git a/packages/demo-input-controls/package.json b/packages/demo-input-controls/package.json
@@ -1,7 +1,7 @@
 {
   "name": "demo-input-controls",
   "description": "Demo application for input controls of Jaspersoft Visualize Components",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "homepage": "https://jaspersoft.github.io/js-visualize-components-samples/pages/input-controls/live-sample.html",
   "license": "BSD-3-Clause",
@@ -16,9 +16,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@jaspersoft/jv-input-controls": "^0.1.9",
-    "@jaspersoft/jv-tools": "^0.1.9",
-    "@jaspersoft/jv-ui-components": "^0.1.9",
+    "@jaspersoft/jv-input-controls": "^0.1.10",
+    "@jaspersoft/jv-tools": "^0.1.10",
+    "@jaspersoft/jv-ui-components": "^0.1.10",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },

diff --git a/packages/demo-scheduler/package.json b/packages/demo-scheduler/package.json
@@ -1,7 +1,7 @@
 {
   "name": "demo-scheduler",
   "description": "Demo application for scheduler of Jaspersoft Visualize Components",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "homepage": "https://jaspersoft.github.io/js-visualize-components-samples/pages/scheduler/demo.html",
   "license": "BSD-3-Clause",
@@ -16,9 +16,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@jaspersoft/jv-scheduler": "^0.1.9",
-    "@jaspersoft/jv-tools": "^0.1.9",
-    "@jaspersoft/jv-ui-components": "^0.1.9",
+    "@jaspersoft/jv-scheduler": "^0.1.10",
+    "@jaspersoft/jv-tools": "^0.1.10",
+    "@jaspersoft/jv-ui-components": "^0.1.10",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },

diff --git a/packages/jv-input-controls/package.json b/packages/jv-input-controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jaspersoft/jv-input-controls",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Component for rendering input controls for a report or ad hoc view using visualize.js",
   "type": "module",
   "main": "dist/index.umd.js",
@@ -66,8 +66,8 @@
     "vite-plugin-dts": "^4.1.0"
   },
   "dependencies": {
-    "@jaspersoft/jv-tools": "^0.1.9",
-    "@jaspersoft/jv-ui-components": "^0.1.9",
+    "@jaspersoft/jv-tools": "^0.1.10",
+    "@jaspersoft/jv-ui-components": "^0.1.10",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-i18next": "^14.1.2"

diff --git a/packages/jv-input-controls/tsconfig.json b/packages/jv-input-controls/tsconfig.json
@@ -25,7 +25,8 @@
     "declaration": true,
     "declarationDir": "dist",
     "sourceMap": true,
-    "outDir": "dist"
+    "outDir": "dist",
+    "allowJs": true
   },
   "include": ["index.ts", "src/**/*"],
   "exclude": ["node_modules", "dist", "jest.config.ts", "babel.config.cjs"]

diff --git a/packages/jv-scheduler/package.json b/packages/jv-scheduler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jaspersoft/jv-scheduler",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Component for rendering the scheduler of Jaspersoft Visualize Components",
   "type": "module",
   "main": "dist/index.umd.js",
@@ -41,9 +41,10 @@
     "@babel/preset-react": "^7.16.0",
     "@babel/preset-typescript": "^7.16.0",
     "@testing-library/jest-dom": "^6.4.5",
-    "@testing-library/react": "^13.3.0",
+    "@testing-library/react": "^15.0.7",
     "@types/jest": "^28.1.6",
-    "@types/react": "^18.0.15",
+    "@types/react": "^18.3.3",
+    "@types/redux-mock-store": "1.0.6",
     "@types/xregexp": "^4.4.0",
     "@vitejs/plugin-react": "^4.3.1",
     "i18next": "^23.11.5",
@@ -54,6 +55,7 @@
     "jest-css-modules-transform": "^4.4.2",
     "jest-environment-jsdom": "^29.7.0",
     "path": "^0.12.7",
+    "redux-mock-store": "1.5.4",
     "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
     "typescript": "^4.7.4",
@@ -63,9 +65,9 @@
     "vite-plugin-ts": "^1.3.2-1"
   },
   "dependencies": {
-    "@jaspersoft/jv-input-controls": "^0.1.9",
-    "@jaspersoft/jv-tools": "^0.1.9",
-    "@jaspersoft/jv-ui-components": "^0.1.9",
+    "@jaspersoft/jv-input-controls": "^0.1.10",
+    "@jaspersoft/jv-tools": "^0.1.10",
+    "@jaspersoft/jv-ui-components": "^0.1.10",
     "axios": "^1.7.2",
     "moment": "^2.30.1",
     "re-resizable": "^6.9.17",
@@ -77,5 +79,8 @@
     "redux": "4.0.5",
     "redux-thunk": "2.3.0",
     "xregexp": "^5.1.1"
+  },
+  "resolutions": {
+    "string-width": "4.2.3"
   }
 }
diff --git a/packages/jv-scheduler/src/components/Stepper/DefaultData.tsx b/packages/jv-scheduler/src/components/Stepper/DefaultData.tsx
@@ -109,7 +109,7 @@ export const OutputStepDefaultMessage = () => {
     ),
     timezones = useSelector((state: IState) => state.userTimeZones);
 
-  const currentTimezone = timezones.filter(
+  const currentTimezone = timezones?.filter(
       (item: { code: string }) => item.code === outputTimezone,
     ),
     OutputTimeZone = `${currentTimezone[0]?.code} - ${currentTimezone[0]?.description}`;

diff --git a/packages/jv-scheduler/src/components/Stepper/StepIcon.tsx b/packages/jv-scheduler/src/components/Stepper/StepIcon.tsx
@@ -19,46 +19,78 @@ type CommonIconProps = {
   dataName: string;
 };
 
-const CommonIcon = ({ icon, className, dataName }: CommonIconProps) => {
+const CommonIcon = ({
+  icon,
+  className,
+  dataName,
+  ...rest
+}: CommonIconProps) => {
   return (
     <JVIcon
       icon={icon}
       className={`jv-mStepper-icon ${className}`}
       data-name={dataName}
+      {...rest}
     />
   );
 };
 
 export const StepIcon = (props: any) => {
-  const { icon } = props;
+  const {
+      icon,
+      error: errorProp,
+      active: activeProp,
+      completed: completedProp,
+      ...rest
+    } = props,
+    error = errorProp ? "true" : undefined,
+    active = activeProp ? "true" : undefined,
+    completed = completedProp ? "true" : undefined;
+
   return (
     <div>
       {icon === SUCCESS_STATE && (
         <CommonIcon
           icon="checkmarkRound"
           className="jv-uColor-success"
           dataName=""
+          active={active}
+          completed={completed}
+          error={error}
+          {...rest}
         />
       )}
       {icon === ERROR_STATE && (
         <CommonIcon
           icon="warningRound"
           className="jv-uColor-error"
           dataName=""
+          active={active}
+          completed={completed}
+          error={error}
+          {...rest}
         />
       )}
       {icon === INCOMPLETE_DEFAULT_STATE && (
         <CommonIcon
           icon="checkmarkRound"
           className="jv-uColor-incomplete"
           dataName=""
+          active={active}
+          completed={completed}
+          error={error}
+          {...rest}
         />
       )}
       {icon === INCOMPLETE_STATE && (
         <CommonIcon
           icon="circleSolid"
           className="jv-uColor-incomplete"
           dataName=""
+          active={active}
+          completed={completed}
+          error={error}
+          {...rest}
         />
       )}
     </div>

diff --git a/packages/jv-scheduler/src/components/Tabs/TabsContent/Output.tsx b/packages/jv-scheduler/src/components/Tabs/TabsContent/Output.tsx
@@ -22,7 +22,7 @@ import {
   OUTPUT_TAB,
   OUTPUT_TIME_ZONE,
 } from "../../../constants/schedulerConstants";
-import { MessageAPIError } from "../../apiFailureError/scheduleAPIError";
+import { MessageAPIError } from "../../apiFailureError/MessageAPIError";
 import { IState, translationProps } from "../../../types/scheduleType";
 import { updateChangeToStore } from "../../../utils/schedulerUtils";
 import i18nScheduler from "../../../i18n";

diff --git a/...ents/apiFailureError/scheduleAPIError.tsx → ...nents/apiFailureError/MessageAPIError.tsx b/...ents/apiFailureError/scheduleAPIError.tsx → ...nents/apiFailureError/MessageAPIError.tsx
diff --git a/packages/jv-scheduler/src/utils/configurationUtils.ts b/packages/jv-scheduler/src/utils/configurationUtils.ts
@@ -35,17 +35,17 @@ const checkAvailabilityOfBasicConfig = (
   server: string,
 ) => {
   const error: { [key: string]: string } = {};
-  if (!resourceURI) {
+  if (!resourceURI || resourceURI.length === 0) {
     error["resource.uri.missing.configuration"] =
       "resourceURI is required in the configuration";
-  } else if (!server) {
+  } else if (!server || server.length === 0) {
     error["server.missing.configuration"] =
       "server is required in the configuration";
   }
   return error;
 };
 
-const checkRequiredDataForHiddenTabs = (tabName: string, tabData: any) => {
+const checkRequiredDataForHiddenTabs = (tabName: string, tabData: any = {}) => {
   const error: { [key: string]: string } = {};
   switch (tabName) {
     case SCHEDULE_TAB: {