Skip to content

Commit

Permalink
Merge branch 'develop' into FWF-4248-incorret-note-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Bonymol-aot authored Jan 15, 2025
2 parents ff94e46 + d6be5bb commit 23d9327
Show file tree
Hide file tree
Showing 26 changed files with 77 additions and 55 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v7.0.0
v7.1.0-alpha
10 changes: 5 additions & 5 deletions deployment/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions deployment/docker/sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---+++++++++++++++++++++++++#

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-api-utils/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-api/requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
git+https://github.com/AOT-Technologies/forms-flow-ai.git@release/7.0.0#subdirectory=forms-flow-api-utils
2 changes: 1 addition & 1 deletion forms-flow-api/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = formsflow_api
version = 7.0.0
version = 7.1.0
author = aot-technologies
classifiers =
Development Status :: Production
Expand Down
6 changes: 3 additions & 3 deletions forms-flow-bpm/forms-flow-bpm-camunda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</parent>

<artifactId>formsflow-bpm-camunda</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>

<name>formsflow BPM Camunda Extension</name>
<description>formsflow BPM Camunda Extension</description>
Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm-utils</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
Expand Down
4 changes: 2 additions & 2 deletions forms-flow-bpm/forms-flow-bpm-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<parent>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</parent>

<artifactId>forms-flow-bpm-utils</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>

<name>formsflow BPM Extension Utils</name>
<description>formsflow BPM Extension</description>
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-bpm/pom-default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
<relativePath>pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-bpm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>formsflow.ai</groupId>
<artifactId>forms-flow-bpm</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
<packaging>pom</packaging>

<name>formsflow BPM Extension</name>
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-documents/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = formsflow_documents
version = 7.0.0
version = 7.1.0
author = aot-technologies
classifiers =
Development Status :: Beta
Expand Down
12 changes: 6 additions & 6 deletions forms-flow-web-root-config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` <br> <br> 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` <br> <br> 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`
Expand Down
10 changes: 5 additions & 5 deletions forms-flow-web-root-config/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions forms-flow-web-root-config/sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@


##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

## 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

Expand Down
2 changes: 1 addition & 1 deletion forms-flow-web-root-config/src/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<link rel="stylesheet" href="https://unpkg.com/dmn-js@16.8.0/dist/assets/dmn-js-decision-table-controls.css">
<link rel="stylesheet" href="https://unpkg.com/dmn-js@16.8.0/dist/assets/dmn-js-literal-expression.css">
<link rel="stylesheet" href="https://unpkg.com/dmn-js@16.8.0/dist/assets/dmn-font/css/dmn.css">
<link rel="stylesheet" href="https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v7.0.0/forms-flow-theme.min.css">
<link rel="stylesheet" href="https://forms-flow-microfrontends.aot-technologies.com/forms-flow-theme@v7.1.0-alpha/forms-flow-theme.min.css">

<!-- required styles from cdn -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap">
Expand Down
4 changes: 2 additions & 2 deletions forms-flow-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion forms-flow-web/package.json
Original file line number Diff line number Diff line change
@@ -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'",
Expand Down
1 change: 1 addition & 0 deletions forms-flow-web/src/components/BPMN/bpm.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
.bpmn-viewer-container{
min-height: 400px;
position:relative;
min-width: 55vw;
}

.grab-cursor {
Expand Down
5 changes: 3 additions & 2 deletions forms-flow-web/src/components/CustomComponents/MultiSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ 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 = [],
selectedRoles = [],
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
Expand Down Expand Up @@ -74,7 +75,7 @@ const RoleSelector = ({
<CustomPill
key={role + index}
label={HelperServices.removeTenantKeyFromData(role,tenantKey)}
icon={<DeleteIcon color="#253DF4" />}
icon={<DeleteIcon color={primaryColor} />}
bg="primary"
onClick={() => removeRole(role)}
/>
Expand Down
10 changes: 8 additions & 2 deletions forms-flow-web/src/components/Form/EditForm/FormEdit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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.",
(
<CustomInfo
heading="Note"
content="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",
Expand Down
5 changes: 3 additions & 2 deletions forms-flow-web/src/components/Form/EditForm/FormSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}
/>
<FormTextArea
label={t("Description")}
name="description"
Expand Down
6 changes: 4 additions & 2 deletions forms-flow-web/src/components/Modals/ActionModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
CustomInfo,
CustomButton,
} from "@formsflow/components";
import { StyleServices } from "@formsflow/service";

const ActionModal = React.memo(
({
Expand All @@ -23,6 +24,7 @@ const ActionModal = React.memo(
diagramType,
isPublished
}) => {
const primaryColor = StyleServices.getCSSVariable('primary');
const handleAction = (actionType) => {
onAction(actionType);
onClose();
Expand Down Expand Up @@ -58,7 +60,7 @@ const ActionModal = React.memo(
<div> Action</div>
</Modal.Title>
<div className="d-flex align-items-center">
<CloseIcon onClick={onClose} color="#253DF4" />
<CloseIcon onClick={onClose} color={primaryColor} />
</div>
</Modal.Header>
<Modal.Body className="action-modal-body">
Expand All @@ -70,7 +72,7 @@ const ActionModal = React.memo(
size="sm"
label="Duplicate"
disabled={!isMigrated}
icon={<DuplicateIcon color="#253DF4" />}
icon={<DuplicateIcon color="#253DF4" />}
className=""
dataTestid="duplicate-form-button"
ariaLabel="Duplicate Button"
Expand Down
Loading

0 comments on commit 23d9327

Please sign in to comment.