diff --git a/VERSION b/VERSION index d18077c214..7dbc37ae38 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v7.0.0 +v7.1.0-alpha diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml index 0c3d0faebc..15b11b73af 100644 --- a/deployment/docker/docker-compose.yml +++ b/deployment/docker/docker-compose.yml @@ -137,11 +137,11 @@ services: context: ./../../forms-flow-web-root-config/ dockerfile: Dockerfile args: - - MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0/forms-flow-web.gz.js} - - MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0/forms-flow-nav.gz.js} - - MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0/forms-flow-service.gz.js} - - MF_FORMSFLOW_COMPONENTS_URL=${MF_FORMSFLOW_COMPONENTS_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.0.0/forms-flow-components.gz.js} - - MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0/forms-flow-admin.gz.js} + - MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.1.0-alpha/forms-flow-web.gz.js} + - MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.1.0-alpha/forms-flow-nav.gz.js} + - MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.1.0-alpha/forms-flow-service.gz.js} + - MF_FORMSFLOW_COMPONENTS_URL=${MF_FORMSFLOW_COMPONENTS_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.1.0-alpha/forms-flow-components.gz.js} + - MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.1.0-alpha/forms-flow-admin.gz.js} - NODE_ENV=${NODE_ENV:-production} entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'" environment: diff --git a/deployment/docker/sample.env b/deployment/docker/sample.env index 097b282acd..bc0ad53319 100644 --- a/deployment/docker/sample.env +++ b/deployment/docker/sample.env @@ -196,13 +196,13 @@ CUSTOM_SUBMISSION_URL=http://{your-ip-address}:{port} #The MF Variables below are used to get MicroFrontend Components Created ##For running locally or if have custom changes then change the url to the one forms-flow-web folder content is running -#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0/forms-flow-web.gz.js +#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.1.0-alpha/forms-flow-web.gz.js ## Refer Github Repo https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends and update to your own custom implementation for the Components here -#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0/forms-flow-nav.gz.js -#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0/forms-flow-service.gz.js -#MF_FORMSFLOW_COMPONENTS_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.0.0/forms-flow-components.gz.js -#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0/forms-flow-admin.gz.js +#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.1.0-alpha/forms-flow-nav.gz.js +#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.1.0-alpha/forms-flow-service.gz.js +#MF_FORMSFLOW_COMPONENTS_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.1.0-alpha/forms-flow-components.gz.js +#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.1.0-alpha/forms-flow-admin.gz.js #++++++++++++++++--- formsflow.ai Web Microfrontend components ENV Variables - STOP ---+++++++++++++++++++++++++# diff --git a/forms-flow-api-utils/setup.py b/forms-flow-api-utils/setup.py index e38fba6c36..e7a57a1c9b 100644 --- a/forms-flow-api-utils/setup.py +++ b/forms-flow-api-utils/setup.py @@ -27,7 +27,7 @@ def read_requirements(filename): setuptools.setup( name='formsflow_api_utils', - version='7.0.0', + version='7.1.0', author='AOT Technologies', description='Formsflow api related libraries.', long_description=read("README.md"), diff --git a/forms-flow-api/requirements/prod.txt b/forms-flow-api/requirements/prod.txt index d385b8c521..ed0c47d9df 100644 --- a/forms-flow-api/requirements/prod.txt +++ b/forms-flow-api/requirements/prod.txt @@ -17,4 +17,4 @@ markupsafe PyJWT redis lxml -git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/7.0.0#subdirectory=forms-flow-api-utils \ No newline at end of file +git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/7.0.0#subdirectory=forms-flow-api-utils diff --git a/forms-flow-api/setup.cfg b/forms-flow-api/setup.cfg index 9c2627b08a..a1e1daec97 100644 --- a/forms-flow-api/setup.cfg +++ b/forms-flow-api/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = formsflow_api -version = 7.0.0 +version = 7.1.0 author = aot-technologies classifiers = Development Status :: Production diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml index d7f2862cfb..f133c099ee 100644 --- a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml +++ b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml @@ -7,11 +7,11 @@ formsflow.ai forms-flow-bpm - 7.0.0 + 7.1.0 formsflow-bpm-camunda - 7.0.0 + 7.1.0 formsflow BPM Camunda Extension formsflow BPM Camunda Extension @@ -76,7 +76,7 @@ formsflow.ai forms-flow-bpm-utils - 7.0.0 + 7.1.0 diff --git a/forms-flow-bpm/forms-flow-bpm-utils/pom.xml b/forms-flow-bpm/forms-flow-bpm-utils/pom.xml index d7581206e4..77e6ffd701 100644 --- a/forms-flow-bpm/forms-flow-bpm-utils/pom.xml +++ b/forms-flow-bpm/forms-flow-bpm-utils/pom.xml @@ -8,11 +8,11 @@ formsflow.ai forms-flow-bpm - 7.0.0 + 7.1.0 forms-flow-bpm-utils - 7.0.0 + 7.1.0 formsflow BPM Extension Utils formsflow BPM Extension diff --git a/forms-flow-bpm/pom-default.xml b/forms-flow-bpm/pom-default.xml index aea1aed5bb..debf114005 100644 --- a/forms-flow-bpm/pom-default.xml +++ b/forms-flow-bpm/pom-default.xml @@ -7,7 +7,7 @@ formsflow.ai forms-flow-bpm - 7.0.0 + 7.1.0 pom.xml diff --git a/forms-flow-bpm/pom.xml b/forms-flow-bpm/pom.xml index 4ea6a79e2d..652c419a92 100644 --- a/forms-flow-bpm/pom.xml +++ b/forms-flow-bpm/pom.xml @@ -6,7 +6,7 @@ formsflow.ai forms-flow-bpm - 7.0.0 + 7.1.0 pom formsflow BPM Extension diff --git a/forms-flow-documents/setup.cfg b/forms-flow-documents/setup.cfg index 18c7cb609a..2ea2bea6fb 100644 --- a/forms-flow-documents/setup.cfg +++ b/forms-flow-documents/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = formsflow_documents -version = 7.0.0 +version = 7.1.0 author = aot-technologies classifiers = Development Status :: Beta diff --git a/forms-flow-web-root-config/README.md b/forms-flow-web-root-config/README.md index 95ae450b1c..893e5dec3c 100644 --- a/forms-flow-web-root-config/README.md +++ b/forms-flow-web-root-config/README.md @@ -57,12 +57,12 @@ is mentioned on the [link](../forms-flow-idm/keycloak/README.md#create-forms-flo Variable name | Meaning | Possible values | Default value | --- | --- |----------| --- - `MF_FORMSFLOW_WEB_URL`:triangular_flag_on_post:| For running locally/ if have custom changes | `//forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0/forms-flow-web.gz.js`

For custom changes: `http://{your-ip-address}:3004/forms-flow-web.js` | `//forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0/forms-flow-nav.gz.js` - `MF_FORMSFLOW_NAV_URL`:triangular_flag_on_post:|For custom implementation of Navbar component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-nav)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0/forms-flow-nav.gz.js` - `MF_FORMSFLOW_SERVICE_URL`:triangular_flag_on_post:|For custom implementation of Service component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-service)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0/forms-flow-service.gz.js` - `MF_FORMSFLOW_COMPONENTS_URL`:triangular_flag_on_post:|For custom implementation of Formsflow components, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-components)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.0.0/forms-flow-components.gz.js` - `MF_FORMSFLOW_ADMIN_URL`:triangular_flag_on_post:|For custom implementation of Admin component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-admin)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0/forms-flow-admin.gz.js` - `MF_FORMSFLOW_THEME_URL`:triangular_flag_on_post:| For custom implementation of Theme component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-theme) | | `//forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v7.0.0/forms-flow-theme.gz.js` + `MF_FORMSFLOW_WEB_URL`:triangular_flag_on_post:| For running locally/ if have custom changes | `//forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.1.0/forms-flow-web.gz.js`

For custom changes: `http://{your-ip-address}:3004/forms-flow-web.js` | `//forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.1.0/forms-flow-nav.gz.js` + `MF_FORMSFLOW_NAV_URL`:triangular_flag_on_post:|For custom implementation of Navbar component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-nav)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.1.0/forms-flow-nav.gz.js` + `MF_FORMSFLOW_SERVICE_URL`:triangular_flag_on_post:|For custom implementation of Service component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-service)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.1.0/forms-flow-service.gz.js` + `MF_FORMSFLOW_COMPONENTS_URL`:triangular_flag_on_post:|For custom implementation of Formsflow components, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-components)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.1.0/forms-flow-components.gz.js` + `MF_FORMSFLOW_ADMIN_URL`:triangular_flag_on_post:|For custom implementation of Admin component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-admin)| |`//forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.1.0/forms-flow-admin.gz.js` + `MF_FORMSFLOW_THEME_URL`:triangular_flag_on_post:| For custom implementation of Theme component, refer [here](https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends/tree/main/forms-flow-theme) | | `//forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v7.1.0/forms-flow-theme.gz.js` `NODE_ENV`| Define project level configuration | `development, test, production` | `production` `LANGUAGE`| Set Application default language | `en` `zh-CN` `pt` `fr` `bg` `de` `es` | `en` `FORMIO_DEFAULT_PROJECT_URL`:triangular_flag_on_post:|The URL of the form.io server| |`http://{your-ip-address}:3001` diff --git a/forms-flow-web-root-config/docker-compose.yml b/forms-flow-web-root-config/docker-compose.yml index 99ce0f027d..08faf3ae81 100644 --- a/forms-flow-web-root-config/docker-compose.yml +++ b/forms-flow-web-root-config/docker-compose.yml @@ -5,11 +5,11 @@ services: context: . dockerfile: Dockerfile args: - - MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0/forms-flow-web.gz.js} - - MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0/forms-flow-nav.gz.js} - - MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0/forms-flow-service.gz.js} - - MF_FORMSFLOW_COMPONENTS_URL=${MF_FORMSFLOW_COMPONENTS_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.0.0/forms-flow-components.gz.js} - - MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0/forms-flow-admin.gz.js} + - MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.1.0-alpha/forms-flow-web.gz.js} + - MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.1.0-alpha/forms-flow-nav.gz.js} + - MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.1.0-alpha/forms-flow-service.gz.js} + - MF_FORMSFLOW_COMPONENTS_URL=${MF_FORMSFLOW_COMPONENTS_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.1.0-alpha/forms-flow-components.gz.js} + - MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.1.0-alpha/forms-flow-admin.gz.js} - NODE_ENV=${NODE_ENV:-production} entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'" environment: diff --git a/forms-flow-web-root-config/sample.env b/forms-flow-web-root-config/sample.env index 92219ebbf4..c490baacea 100644 --- a/forms-flow-web-root-config/sample.env +++ b/forms-flow-web-root-config/sample.env @@ -13,7 +13,7 @@ ##For running locally or if have custom changes then change the url to the one forms-flow-web folder content is running -#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.0.0/forms-flow-web.gz.js +#MF_FORMSFLOW_WEB_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-web@v7.1.0-alpha/forms-flow-web.gz.js #TODO only for Customised Local delevelopment with code from forms-flow-web folder content use below default values instead #MF_FORMSFLOW_WEB_URL=//{your-ip-address}:3004/forms-flow-web.js @@ -21,10 +21,10 @@ ## Use this as default values ## (Note: https://forms-flow-microfrontends.aot-technologies.com/{MF-componet-name}@{version}/{MF-componet-name}.gz.js, will be the default format ) ## Refer Github Repo https://github.com/AOT-Technologies/forms-flow-ai-micro-front-ends and update to your own custom implementation for the Components here -#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.0.0/forms-flow-nav.gz.js -#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.0.0/forms-flow-service.gz.js -#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.0.0/forms-flow-admin.gz.js -#MF_FORMSFLOW_COMPONENTS_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.0.0/forms-flow-components.gz.js +#MF_FORMSFLOW_NAV_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-nav@v7.1.0-alpha/forms-flow-nav.gz.js +#MF_FORMSFLOW_SERVICE_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-service@v7.1.0-alpha/forms-flow-service.gz.js +#MF_FORMSFLOW_ADMIN_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-admin@v7.1.0-alpha/forms-flow-admin.gz.js +#MF_FORMSFLOW_COMPONENTS_URL=https://forms-flow-microfrontends.aot-technologies.com/forms-flow-components@v7.1.0-alpha/forms-flow-components.gz.js #OR diff --git a/forms-flow-web-root-config/src/index.ejs b/forms-flow-web-root-config/src/index.ejs index 911242da52..c5d64fa696 100644 --- a/forms-flow-web-root-config/src/index.ejs +++ b/forms-flow-web-root-config/src/index.ejs @@ -16,7 +16,7 @@ - + diff --git a/forms-flow-web/package-lock.json b/forms-flow-web/package-lock.json index 5c7cc636ba..0f8efbbe5d 100644 --- a/forms-flow-web/package-lock.json +++ b/forms-flow-web/package-lock.json @@ -1,12 +1,12 @@ { "name": "formsflow-ai-react", - "version": "7.0.0", + "version": "7.1.0-alpha", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "formsflow-ai-react", - "version": "7.0.0", + "version": "7.1.0-alpha", "license": "MIT", "dependencies": { "@aot-technologies/formio-react": "^1.0.4", diff --git a/forms-flow-web/package.json b/forms-flow-web/package.json index 889b829d4a..33c4215643 100644 --- a/forms-flow-web/package.json +++ b/forms-flow-web/package.json @@ -1,7 +1,7 @@ { "name": "formsflow-ai-react", "description": "React web app for formsflow.ai project", - "version": "7.0.0", + "version": "7.1.0-alpha", "main": "single-spa-index.js", "scripts": { "analyze": "source-map-explorer 'build/static/js/*.js'", diff --git a/forms-flow-web/src/components/BPMN/bpm.scss b/forms-flow-web/src/components/BPMN/bpm.scss index 6f93fb39bb..8aad9173a7 100644 --- a/forms-flow-web/src/components/BPMN/bpm.scss +++ b/forms-flow-web/src/components/BPMN/bpm.scss @@ -9,6 +9,7 @@ .bpmn-viewer-container{ min-height: 400px; position:relative; + min-width: 55vw; } .grab-cursor { diff --git a/forms-flow-web/src/components/CustomComponents/MultiSelect.js b/forms-flow-web/src/components/CustomComponents/MultiSelect.js index 5644a1c4be..0ef4016452 100644 --- a/forms-flow-web/src/components/CustomComponents/MultiSelect.js +++ b/forms-flow-web/src/components/CustomComponents/MultiSelect.js @@ -3,7 +3,7 @@ import { useSelector } from "react-redux"; import { ListGroup } from "react-bootstrap"; import { CustomPill,DeleteIcon } from "@formsflow/components"; import PropTypes from 'prop-types'; -import { HelperServices } from "@formsflow/service"; +import { HelperServices, StyleServices } from "@formsflow/service"; const RoleSelector = ({ allRoles = [], @@ -11,6 +11,7 @@ const RoleSelector = ({ setSelectedRoles, openByDefault = false, }) => { + const primaryColor = StyleServices.getCSSVariable('primary'); const [roleInput, setRoleInput] = useState(""); const [filteredRoles, setFilteredRoles] = useState([]); const [isDropdownOpen, setIsDropdownOpen] = useState(false); // To control dropdown visibility @@ -74,7 +75,7 @@ const RoleSelector = ({ } + icon={} bg="primary" onClick={() => removeRole(role)} /> diff --git a/forms-flow-web/src/components/Form/EditForm/FormEdit.js b/forms-flow-web/src/components/Form/EditForm/FormEdit.js index 9f92b316aa..fbfe4e1a77 100644 --- a/forms-flow-web/src/components/Form/EditForm/FormEdit.js +++ b/forms-flow-web/src/components/Form/EditForm/FormEdit.js @@ -16,7 +16,8 @@ import { PreviewIcon, FormBuilderModal, HistoryModal, - ImportModal + ImportModal, + CustomInfo } from "@formsflow/components"; import { RESOURCE_BUNDLES_DATA } from "../../../resourceBundles/i18n"; import LoadingOverlay from "react-loading-overlay-ts"; @@ -962,7 +963,12 @@ const handleSaveLayout = () => { return { title: "Unpublish Before Saving", message: - "This form is currently live. To save the changes to your form, you need to unpublish it first. By unpublishing this form, you will make it unavailable for new submissions. You can republish this form after making your edits.", + ( + + ), primaryBtnAction: handleConfirmUnpublishAndSave, secondayBtnAction: closeModal, primaryBtnText: isFlowLayout ? "Unpublish and Save Flow" : "Unpublish and Save Layout", diff --git a/forms-flow-web/src/components/Form/EditForm/FormSettings.js b/forms-flow-web/src/components/Form/EditForm/FormSettings.js index d72fa8495b..b4cfdf43d4 100644 --- a/forms-flow-web/src/components/Form/EditForm/FormSettings.js +++ b/forms-flow-web/src/components/Form/EditForm/FormSettings.js @@ -227,8 +227,9 @@ const FormSettings = forwardRef((props, ref) => { isInvalid = {!!errors.name} feedback = {errors.name} turnOnLoader={isValidating.name} - onBlur={() => handleBlur('name', formDetails.title)} - /> + onBlur={() => handleBlur('name', formDetails.title)} + maxLength={200} + /> { + const primaryColor = StyleServices.getCSSVariable('primary'); const handleAction = (actionType) => { onAction(actionType); onClose(); @@ -58,7 +60,7 @@ const ActionModal = React.memo(
Action
- +
@@ -70,7 +72,7 @@ const ActionModal = React.memo( size="sm" label="Duplicate" disabled={!isMigrated} - icon={} + icon={} className="" dataTestid="duplicate-form-button" ariaLabel="Duplicate Button" diff --git a/forms-flow-web/src/components/Modals/ImportProcess.js b/forms-flow-web/src/components/Modals/ImportProcess.js index c686a4e31c..5e05728ed8 100644 --- a/forms-flow-web/src/components/Modals/ImportProcess.js +++ b/forms-flow-web/src/components/Modals/ImportProcess.js @@ -2,10 +2,11 @@ import React, { useState, useEffect } from "react"; import PropTypes from "prop-types"; import { ImportModal } from "@formsflow/components"; import FileService from "../../services/FileService"; -import { createProcess } from "../../apiManager/services/processServices"; +import { createProcess,updateProcess } from "../../apiManager/services/processServices"; import { useSelector, useDispatch } from "react-redux"; import { push } from "connected-react-router"; import { MULTITENANCY_ENABLED } from "../../constants/constants"; +import {setProcessData} from "../../actions/processActions"; const ImportProcess = React.memo(({ showModal, @@ -75,6 +76,12 @@ const ImportProcess = React.memo(({ if(!xml) return; if (processId) { // Update an existing process + const response = await updateProcess({ + id: processId, + data:xml, + type: fileType === ".bpmn" ? "bpmn" : "dmn" + }); + dispatch(setProcessData(response?.data)); setImportXml(xml); closeImport(); } else { diff --git a/forms-flow-web/src/components/Modals/TaskVariableModal.js b/forms-flow-web/src/components/Modals/TaskVariableModal.js index 10ef36528e..3c9175d674 100644 --- a/forms-flow-web/src/components/Modals/TaskVariableModal.js +++ b/forms-flow-web/src/components/Modals/TaskVariableModal.js @@ -15,6 +15,8 @@ import { saveFormProcessMapperPut, } from "../../apiManager/services/processServices"; import _ from "lodash"; +import { StyleServices } from "@formsflow/service"; + // Filter out applicationId and applicationStatus const ignoreKeywords = new Set([ @@ -31,6 +33,8 @@ import _ from "lodash"; //TBD in case of Bundle form display const PillList = React.memo(({ alternativeLabels, onRemove }) => { const { t } = useTranslation(); + const primaryColor = StyleServices.getCSSVariable('primary'); + const secondaryColor = StyleServices.getCSSVariable('secondary'); const filteredVariablePills = Object.values(alternativeLabels).filter( ({ key }) => !ignoreKeywords.has(key) @@ -43,8 +47,8 @@ const PillList = React.memo(({ alternativeLabels, onRemove }) => { } - bg="#E7E9FE" + icon={} + bg={secondaryColor} onClick={() => onRemove(key)} secondaryLabel={key} /> diff --git a/forms-flow-web/src/components/PrivateRoute.jsx b/forms-flow-web/src/components/PrivateRoute.jsx index 5d1ceda3f1..68b98a3db0 100644 --- a/forms-flow-web/src/components/PrivateRoute.jsx +++ b/forms-flow-web/src/components/PrivateRoute.jsx @@ -160,8 +160,8 @@ const PrivateRoute = React.memo((props) => { if (!authenticated) { setAuthError(true); } else { - authenticate(instance, props.store); publish("FF_AUTH", instance); + authenticate(instance, props.store); } }); } diff --git a/jobs/sentiment-analysis/setup.cfg b/jobs/sentiment-analysis/setup.cfg index 65cec9805a..766e3b04ec 100755 --- a/jobs/sentiment-analysis/setup.cfg +++ b/jobs/sentiment-analysis/setup.cfg @@ -2,7 +2,7 @@ name = sentiment_analysis url = https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/ author = AOT Technologies -version = 7.0.0 +version = 7.1.0 author_email = classifiers = Development Status :: Beta