From 80303136100f3c2fe1ce9db7824f865b4b413855 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Wed, 15 Jan 2025 12:14:14 +0530 Subject: [PATCH 1/8] Added: added multiselect in components --- forms-flow-components/package-lock.json | 15 +++++++++ forms-flow-components/package.json | 15 ++++----- .../CustomComponents/MultiSelect.tsx | 31 +++++++++++++++++++ forms-flow-components/src/components/index.ts | 2 +- 4 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 forms-flow-components/src/components/CustomComponents/MultiSelect.tsx diff --git a/forms-flow-components/package-lock.json b/forms-flow-components/package-lock.json index 0f18ad252..664831fd7 100644 --- a/forms-flow-components/package-lock.json +++ b/forms-flow-components/package-lock.json @@ -12,6 +12,7 @@ "@types/react-dom": "^17.0.9", "@types/systemjs": "^6.1.1", "@types/webpack-env": "^1.16.2", + "multiselect-react-dropdown": "^2.0.25", "single-spa": "^5.9.3", "single-spa-react": "^4.3.1" }, @@ -11382,6 +11383,14 @@ "multicast-dns": "cli.js" } }, + "node_modules/multiselect-react-dropdown": { + "version": "2.0.25", + "resolved": "https://registry.npmjs.org/multiselect-react-dropdown/-/multiselect-react-dropdown-2.0.25.tgz", + "integrity": "sha512-z8kUSyBNOuV7vn4Dk35snzXWtIfTdSEEXhgDdLMvOmR+xJFx35vc1voUlSuOvrk3khb+hXC219Qs9szOvNm25Q==", + "peerDependencies": { + "react": "^16.7.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", @@ -23730,6 +23739,12 @@ "thunky": "^1.0.2" } }, + "multiselect-react-dropdown": { + "version": "2.0.25", + "resolved": "https://registry.npmjs.org/multiselect-react-dropdown/-/multiselect-react-dropdown-2.0.25.tgz", + "integrity": "sha512-z8kUSyBNOuV7vn4Dk35snzXWtIfTdSEEXhgDdLMvOmR+xJFx35vc1voUlSuOvrk3khb+hXC219Qs9szOvNm25Q==", + "requires": {} + }, "nanoid": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", diff --git a/forms-flow-components/package.json b/forms-flow-components/package.json index a64701fa4..545b0a74c 100644 --- a/forms-flow-components/package.json +++ b/forms-flow-components/package.json @@ -34,11 +34,17 @@ "eslint-config-prettier": "^8.3.0", "eslint-config-ts-react-important-stuff": "^3.0.0", "eslint-plugin-prettier": "^3.4.1", + "i18next-browser-languagedetector": "^7.0.1", "identity-obj-proxy": "^3.0.0", "jest": "^27.0.6", "jest-cli": "^27.0.6", "prettier": "^2.3.2", "pretty-quick": "^3.1.1", + "react": "^17.0.2", + "react-bootstrap": "^1.6.0", + "react-dom": "^17.0.2", + "react-i18next": "^12.1.4", + "react-js-pagination": "^3.0.3", "sass": "^1.57.1", "sass-loader": "^13.2.0", "ts-config-single-spa": "^3.0.0", @@ -49,19 +55,14 @@ "webpack-config-single-spa-react-ts": "^4.0.0", "webpack-config-single-spa-ts": "^4.0.0", "webpack-dev-server": "^4.0.0", - "webpack-merge": "^5.8.0", - "react": "^17.0.2", - "react-bootstrap": "^1.6.0", - "react-dom": "^17.0.2", - "i18next-browser-languagedetector": "^7.0.1", - "react-i18next": "^12.1.4", - "react-js-pagination": "^3.0.3" + "webpack-merge": "^5.8.0" }, "dependencies": { "@types/react": "^17.0.19", "@types/react-dom": "^17.0.9", "@types/systemjs": "^6.1.1", "@types/webpack-env": "^1.16.2", + "multiselect-react-dropdown": "^2.0.25", "single-spa": "^5.9.3", "single-spa-react": "^4.3.1" }, diff --git a/forms-flow-components/src/components/CustomComponents/MultiSelect.tsx b/forms-flow-components/src/components/CustomComponents/MultiSelect.tsx new file mode 100644 index 000000000..46ed6763b --- /dev/null +++ b/forms-flow-components/src/components/CustomComponents/MultiSelect.tsx @@ -0,0 +1,31 @@ +import React from "react"; +import Multiselect from 'multiselect-react-dropdown'; + + +interface MultiSelectInterface { + options: Array; + selectedValues?: Array; + onSelect?: (selected: any) => void; + onRemove?: (removed: any) => void; + displayValue?: string; + avoidHighlightFirstOption?: boolean; +} + +export const MultipleSelect: React.FC = ({ + options = [], + selectedValues = [], + onSelect = ()=> {}, + onRemove = ()=> {}, + displayValue= "", + avoidHighlightFirstOption = true + +})=>{ + return +} \ No newline at end of file diff --git a/forms-flow-components/src/components/index.ts b/forms-flow-components/src/components/index.ts index 390faa253..8624ee8ee 100644 --- a/forms-flow-components/src/components/index.ts +++ b/forms-flow-components/src/components/index.ts @@ -20,4 +20,4 @@ export * from "./CustomComponents/ErrorModal"; export * from "./CustomComponents/ImportModal"; export * from "./CustomComponents/NoDataFound"; export * from "./CustomComponents/ShowPremiumIcon"; - +export * from "./CustomComponents/MultiSelect"; \ No newline at end of file From 89b582890b00d0303cf809f0ddf55601bcc69e34 Mon Sep 17 00:00:00 2001 From: Ajay krishna Date: Thu, 16 Jan 2025 15:22:15 +0530 Subject: [PATCH 2/8] listing table styles update --- .../CustomComponents/InputDropdown.tsx | 2 +- .../CustomComponents/NoDataFound.tsx | 2 +- .../ReusableProcessTableRow.tsx | 2 +- .../CustomComponents/TableFooter.tsx | 16 ++++-- .../src/components/SvgIcons/index.tsx | 54 +++++++++++++++---- forms-flow-theme/scss/_button.scss | 10 +--- forms-flow-theme/scss/_forms.scss | 10 +++- forms-flow-theme/scss/_table.scss | 20 +++++-- 8 files changed, 84 insertions(+), 32 deletions(-) diff --git a/forms-flow-components/src/components/CustomComponents/InputDropdown.tsx b/forms-flow-components/src/components/CustomComponents/InputDropdown.tsx index c3d0fd0a3..5e71fd916 100644 --- a/forms-flow-components/src/components/CustomComponents/InputDropdown.tsx +++ b/forms-flow-components/src/components/CustomComponents/InputDropdown.tsx @@ -49,7 +49,7 @@ export const InputDropdown: React.FC = ({ onBlurDropDown }) => { const { t } = useTranslation(); - const primaryColor = StyleServices.getCSSVariable('primary'); + const primaryColor = StyleServices.getCSSVariable('--ff-primary'); const [isDropdownOpen, setIsDropdownOpen] = useState(false); const [inputValue, setInputValue] = useState(selectedOption || ''); const [filteredItems, setFilteredItems] = useState([]); diff --git a/forms-flow-components/src/components/CustomComponents/NoDataFound.tsx b/forms-flow-components/src/components/CustomComponents/NoDataFound.tsx index 44d228f0e..6901b701c 100644 --- a/forms-flow-components/src/components/CustomComponents/NoDataFound.tsx +++ b/forms-flow-components/src/components/CustomComponents/NoDataFound.tsx @@ -8,7 +8,7 @@ export const NoDataFound: React.FC = () => { - {t("Nothing is found. Please try again.")} + {t("Nothing is found based on your search query. Please try again.")} diff --git a/forms-flow-components/src/components/CustomComponents/ReusableProcessTableRow.tsx b/forms-flow-components/src/components/CustomComponents/ReusableProcessTableRow.tsx index a9b9aec73..a773f787e 100644 --- a/forms-flow-components/src/components/CustomComponents/ReusableProcessTableRow.tsx +++ b/forms-flow-components/src/components/CustomComponents/ReusableProcessTableRow.tsx @@ -22,7 +22,7 @@ export const ReusableProcessTableRow: React.FC = ({ item, return ( - {item.name} + {item.name} {item.processKey} diff --git a/forms-flow-components/src/components/CustomComponents/TableFooter.tsx b/forms-flow-components/src/components/CustomComponents/TableFooter.tsx index 05848a6a6..5d7768651 100644 --- a/forms-flow-components/src/components/CustomComponents/TableFooter.tsx +++ b/forms-flow-components/src/components/CustomComponents/TableFooter.tsx @@ -2,8 +2,8 @@ import React from "react"; import { useTranslation } from "react-i18next"; import Pagination from "react-js-pagination"; import { Dropdown } from "react-bootstrap"; -import { DownArrowIcon } from "../SvgIcons/index"; - +import { DownArrowIcon, AngleLeftIcon, AngleRightIcon } from "../SvgIcons/index"; +import { StyleServices } from "@formsflow/service"; interface PageOption { value: number; text: string; @@ -32,10 +32,10 @@ export const TableFooter: React.FC = ({
- + {t("Showing")} {limit * activePage - (limit - 1)} {t("to")}  {Math.min(limit * activePage, totalCount)} {t("of")}  - {totalCount} {t("results")} + {totalCount}
@@ -51,6 +51,12 @@ export const TableFooter: React.FC = ({ itemClass="page-item" linkClass="page-link" onChange={handlePageChange} + prevPageText={ + {}}/> + } + nextPageText={ + {}} /> + } /> @@ -66,6 +72,7 @@ export const TableFooter: React.FC = ({ data-testid="page-limit-dropdown-toggle" > {limit} + {pageOptions.map((option) => ( @@ -80,7 +87,6 @@ export const TableFooter: React.FC = ({ ))} - diff --git a/forms-flow-components/src/components/SvgIcons/index.tsx b/forms-flow-components/src/components/SvgIcons/index.tsx index 52d4a934c..b2c7b5583 100644 --- a/forms-flow-components/src/components/SvgIcons/index.tsx +++ b/forms-flow-components/src/components/SvgIcons/index.tsx @@ -372,21 +372,20 @@ export const IButton = ({ color = grayColor, ...props }) => ( ); -export const DownArrowIcon = ({ color = grayColor, ...props }) => ( +export const DownArrowIcon = ({ color = baseColor, ...props }) => ( ); @@ -453,6 +452,26 @@ export const AngleRightIcon = ({ color = baseColor, onClick, ...props }) => ( ); +export const AngleLeftIcon = ({ color = baseColor, onClick, ...props }) => ( + + + +); + + export const UploadIcon = ({ color = baseColor, ...props }) => ( ( ); +export const SortIcon = ({ color = grayColor, ...props }) => ( + + + +); \ No newline at end of file diff --git a/forms-flow-theme/scss/_button.scss b/forms-flow-theme/scss/_button.scss index 6d6b6b652..2683578ba 100644 --- a/forms-flow-theme/scss/_button.scss +++ b/forms-flow-theme/scss/_button.scss @@ -473,15 +473,7 @@ $btn-font-weight: bold; min-width: $dropdown-btn-size !important; min-height: $dropdown-btn-size !important; margin: 0 !important; - - &:hover, - &:active, - &:focus { - color: $black-color !important; - background-color: $gray-000 !important; - font-weight: $btn-font-weight; - outline: transparent !important; - } + gap: var(--spacer-075) !important;; } .dropdown-toggle { diff --git a/forms-flow-theme/scss/_forms.scss b/forms-flow-theme/scss/_forms.scss index 589419daf..658d76cfd 100644 --- a/forms-flow-theme/scss/_forms.scss +++ b/forms-flow-theme/scss/_forms.scss @@ -124,7 +124,7 @@ select option:hover { font-size: var(--font-size-xs); font-weight: var(--font-weight-sm); line-height: var(--text-line-height); - padding: var(--spacer-050) var(--spacer-200) var(--spacer-050) var(--spacer-100) !important; + padding: var(--spacer-075) var(--spacer-100) !important; height: 2.063rem; @@ -140,6 +140,14 @@ select option:hover { border: 1px solid var(--ff-gray-800); background-color: var(--ff-gray-100) !important; } + &::placeholder { + color: var(--ff-gray-300) !important; + font-size: var(--font-size-sm) !important; + font-weight: var(--font-weight-sm); + } + &:focus::placeholder { + color: var(--ff-gray-300) !important; + } } .search-box-icon { diff --git a/forms-flow-theme/scss/_table.scss b/forms-flow-theme/scss/_table.scss index 050664c06..e1e2a9627 100644 --- a/forms-flow-theme/scss/_table.scss +++ b/forms-flow-theme/scss/_table.scss @@ -8,7 +8,7 @@ $status-radius: 50%; .custom-tables-wrapper { height: auto; - max-height: calc(100vh - 6.8rem); + max-height: calc(100vh - 4rem); overflow-y: auto; overflow-x: hidden; border-radius: $tr-th-border-radius !important; @@ -21,10 +21,9 @@ $status-radius: 50%; border-spacing: 0 !important; border-radius: var(--radius-0150) !important; - th, td { vertical-align: middle !important; - padding: var(--spacer-125) var(--spacer-150) !important; + padding: var(--spacer-050) var(--spacer-125) !important; font-size: var(--font-size-xs) !important; } @@ -34,7 +33,8 @@ $status-radius: 50%; width: 100%; z-index: 2; background-color: var(--ff-white); - + font-size: var(--font-size-xs) !important; + vertical-align: middle !important; // Table Header Styles th { width: $th-width; @@ -42,6 +42,7 @@ $status-radius: 50%; top: 0; z-index: $th-z-index-default; background-color: inherit; + padding: var(--spacer-100) var(--spacer-125) !important; &:first-child, &:last-child { @@ -183,7 +184,6 @@ $status-radius: 50%; text-align: inherit; display: flex; align-items: center; - justify-content: space-between; width: 100%; } .text-ellipsis { @@ -208,3 +208,13 @@ $status-radius: 50%; } } } +//table header sortIcon rotation +.arrow-up { + transform: rotate(0deg); + transition: transform 0.3s ease; +} + +.arrow-down { + transform: rotate(180deg); + transition: transform 0.3s ease; +} From 72da66c2730a0a811992fe4d1d5b66b87c80bf3b Mon Sep 17 00:00:00 2001 From: athul-aot Date: Thu, 16 Jan 2025 23:03:17 -0800 Subject: [PATCH 3/8] FWF-4179: [Bugfix] Added translation --- .../src/resourceBundles/bg/resourceBundles.ts | 25 +++++++++++++++++ .../src/resourceBundles/de/resourceBundles.ts | 25 +++++++++++++++++ .../src/resourceBundles/es/resourceBundles.ts | 24 +++++++++++++++++ .../src/resourceBundles/fr/resourceBundles.ts | 26 +++++++++++++++++- .../src/resourceBundles/pt/resourceBundles.ts | 25 +++++++++++++++++ .../src/resourceBundles/zh/resourceBundles.ts | 27 ++++++++++++++++++- 6 files changed, 150 insertions(+), 2 deletions(-) diff --git a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts index cb4580629..ea647a68a 100644 --- a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts @@ -1209,4 +1209,29 @@ export const RESOURCE_BUNDLES_BG = { "New Form Description": "Ново описание на формуляра", "Save and Edit form": "Запазване и редактиране на формуляра", "Build New Form": "Създай нов формуляр", + "Search Form Name and Description": "Търсене на име и описание на формуляра", + "New Form": "Нова форма", + "Add Form": "Добави форма", + "Build": "Изграждане", + "Import": "Импортиране", + "Create the form from scratch": "Създайте формуляр от нулата", + "Upload form from a file": "Качете формуляр от файл", + "Live": "На живо", + "Draft": "Чернова", + "Last Edited": "Последно редактирано", + "ID": "ИД", + "New BPMN": "Нов BPMN", + "Create the BPMN from scratch": "Създайте BPMN от нулата", + "Upload BPMN from a file": "Качете BPMN от файл", + "Search BPMN Name": "Търсене на име на BPMN", + "New DMN": "Ново DMN", + "Search Decision Table": "Търсене на таблица за решения", + "Create the DMN from scratch": "Създайте DMN от нулата", + "Upload DMN from a file": "Качете DMN от файл", + "Create And Edit BPMN": "Създаване и редактиране на BPMN", + "Create And Edit DMN": "Създаване и редактиране на DMN", + "Import New Form": "Импортиране на нова форма", + "Confirm and Edit form": "Потвърдете и редактирайте формата", + "Click or drag a file to this area to import": "Щракнете или плъзнете файл в тази област, за да го импортирате", + "Import New": "Импортиране на ново", } diff --git a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts index 6cb058116..a160fa5b6 100644 --- a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts @@ -1214,4 +1214,29 @@ export const RESOURCE_BUNDLES_DE = { "New Form Description": "Neue Formularbeschreibung", "Save and Edit form": "Formular speichern und bearbeiten", "Build New Form": "Neues Formular erstellen", + "Search Form Name and Description": "Suchformularname und Beschreibung", + "New Form": "Neues Formular", + "Add Form": "Formular hinzufügen", + "Build": "bauen", + "Import": "Importieren", + "Create the form from scratch": "Erstellen Sie das Formular von Grund auf", + "Upload form from a file": "Formular aus einer Datei hochladen", + "Live": "Live", + "Draft": "Entwurf", + "Last Edited": "Zuletzt bearbeitet", + "ID": "ID", + "New BPMN": "Neues BPMN", + "Create the BPMN from scratch": "Erstellen Sie das BPMN von Grund auf", + "Import New Form": "Neues Formular importieren", + "Confirm and Edit form": "Formular bestätigen und bearbeiten", + "Click or drag a file to this area to import": "Klicken oder ziehen Sie eine Datei in diesen Bereich, um sie zu importieren", + "Upload BPMN from a file": "BPMN aus einer Datei hochladen", + "Search BPMN Name": "BPMN-Namen suchen", + "New DMN": "Neue DMN", + "Search Decision Table": "Entscheidungstabelle suchen", + "Create the DMN from scratch": "Erstellen Sie das DMN von Grund auf", + "Upload DMN from a file": "DMN aus einer Datei hochladen", + "Create And Edit BPMN": "Erstellen und Bearbeiten von BPMN", + "Create And Edit DMN": "Erstellen und Bearbeiten von DMN", + "Import New": "Neu importieren", } diff --git a/forms-flow-service/src/resourceBundles/es/resourceBundles.ts b/forms-flow-service/src/resourceBundles/es/resourceBundles.ts index c10539899..1a4a8ec7d 100644 --- a/forms-flow-service/src/resourceBundles/es/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/es/resourceBundles.ts @@ -698,4 +698,28 @@ export const RESOURCE_BUNDLES_ES = { "New Form Description": "Nueva descripción del formulario", "Save and Edit form": "Guardar y editar formulario", "Build New Form": "Crear nuevo formulario", + "Search Form Name and Description": "Buscar el nombre y la descripción del formulario", + "New Form": "Nuevo formulario", + "Add Form": "Añadir formulario", + "Build": "Construir", + "Import": "Importar", + "Create the form from scratch": "Crear el formulario desde cero", + "Upload form from a file": "Subir formulario desde un archivo", + "Live": "En vivo", + "Draft": "Borrador", + "Last Edited": "Última edición", + "ID": "ID", + "New BPMN": "Nuevo BPMN", + "Create the BPMN from scratch": "Crear el BPMN desde cero", + "Upload BPMN from a file": "Subir BPMN desde un archivo", + "New DMN": "Nuevo DMN", + "Search Decision Table": "Buscar Tabla de Decisiones", + "Create the DMN from scratch": "Crear el DMN desde cero", + "Upload DMN from a file": "Subir DMN desde un archivo", + "Create And Edit BPMN": "Crear y Editar BPMN", + "Create And Edit DMN": "Crear y Editar DMN", + "Import New Form": "Importar nuevo formulario", + "Confirm and Edit form": "Confirmar y editar formulario", + "Click or drag a file to this area to import": "Haga clic o arrastre un archivo a esta área para importarlo", + "Import New": "Importar Nuevo", } diff --git a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts index 2b114d3a6..203e81f5a 100644 --- a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts @@ -1199,7 +1199,6 @@ export const RESOURCE_BUNDLES_FR ={ "Permissions": "Autorisations", "Edit Permissions": "Modifier les autorisations", "Select Permissions": "Sélectionner des autorisations" , - "Proceed to Sign In": "Procéder à la connexion", "Contact formsflow.ai support": "Contacter le support de formsflow.ai", "Please provide your tenant name to sign in": "Veuillez fournir le nom de votre locataire pour vous connecter", @@ -1212,6 +1211,31 @@ export const RESOURCE_BUNDLES_FR ={ "New Form Description": "Nouvelle description de formulaire", "Save and Edit form": "Enregistrer et modifier le formulaire", "Build New Form": "Créer un nouveau formulaire", + "Search Form Name and Description": "Rechercher le nom et la description du formulaire", + "New Form": "Nouveau formulaire", + "Add Form": "Ajouter un formulaire", + "Build": "Construire", + "Import": "Importer", + "Create the form from scratch": "Créer le formulaire à partir de zéro", + "Upload form from a file": "Télécharger le formulaire depuis un fichier", + "Live": "En direct", + "Draft": "Brouillon", + "Last Edited": "Dernière édition", + "ID": "ID", + "New BPMN": "Nouveau BPMN", + "Create the BPMN from scratch": "Créer le BPMN à partir de zéro", + "Upload BPMN from a file": "Télécharger le BPMN depuis un fichier", + "Search BPMN Name": "Rechercher un nom BPMN", + "New DMN": "Nouveau DMN", + "Search Decision Table": "Rechercher une table de décision", + "Create the DMN from scratch": "Créer le DMN à partir de zéro", + "Upload DMN from a file": "Télécharger le DMN depuis un fichier", + "Import New Form": "Importer un nouveau formulaire", + "Confirm and Edit form": "Confirmer et modifier le formulaire", + "Click or drag a file to this area to import": "Cliquez ou glissez un fichier dans cette zone pour l'importer", + "Create And Edit BPMN": "Créer et modifier le BPMN", + "Create And Edit DMN": "Créer et modifier le DMN", + "Import New": "Importer un nouveau", } diff --git a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts index c0b7d2dec..61546d1f8 100644 --- a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts @@ -1211,4 +1211,29 @@ export const RESOURCE_BUNDLES_PT ={ "New Form Description": "Nova descrição do formulário", "Save and Edit form": "Salvar e Editar formulário", "Build New Form": "Criar novo formulário", + "Search Form Name and Description": "Pesquisar Nome e Descrição do Formulário", + "New Form": "Novo Formulário", + "Add Form": "Adicionar Formulário", + "Build": "Construir", + "Import": "Importar", + "Create the form from scratch": "Criar o formulário do zero", + "Upload form from a file": "Carregar formulário de um arquivo", + "Live": "Ao vivo", + "Draft": "Rascunho", + "Last Edited": "Última Edição", + "ID": "ID", + "New BPMN": "Novo BPMN", + "Create the BPMN from scratch": "Criar o BPMN do zero", + "Upload BPMN from a file": "Carregar BPMN de um arquivo", + "Search BPMN Name": "Pesquisar Nome BPMN", + "New DMN": "Novo DMN", + "Import New Form": "Importar Novo Formulário", + "Confirm and Edit form": "Confirmar e Editar formulário", + "Click or drag a file to this area to import": "Clique ou arraste um arquivo para esta área para importar", + "Search Decision Table": "Pesquisar Tabela de Decisão", + "Create the DMN from scratch": "Criar o DMN do zero", + "Upload DMN from a file": "Carregar DMN de um arquivo", + "Create And Edit BPMN": "Criar e Editar BPMN", + "Create And Edit DMN": "Criar e Editar DMN", + "Import New": "Importar Novo", }; diff --git a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts index 68fa4fca6..f0588de77 100644 --- a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts @@ -1197,5 +1197,30 @@ export const RESOURCE_BUNDLES_ZH = { "New Form Name": "新表单名称", "New Form Description": "新表单描述", "Save and Edit form": "保存并编辑表单", - "Build New Form": "创建新表单" + "Build New Form": "创建新表单", + "Search Form Name and Description": "搜索表单名称和描述", + "New Form": "新表单", + "Add Form": "添加表单", + "Build": "构建", + "Import": "导入", + "Create the form from scratch": "从头创建表单", + "Upload form from a file": "从文件上传表单", + "Live": "直播", + "Draft": "草稿", + "Last Edited": "最后编辑", + "ID": "标识", + "New BPMN": "新的 BPMN", + "Create the BPMN from scratch": "从头创建 BPMN", + "Upload BPMN from a file": "从文件上传 BPMN", + "Search BPMN Name": "搜索 BPMN 名称", + "New DMN": "新的 DMN", + "Search Decision Table": "搜索决策表", + "Create the DMN from scratch": "从头创建 DMN", + "Upload DMN from a file": "从文件上传 DMN", + "Import New Form": "导入新表单", + "Confirm and Edit form": "确认并编辑表单", + "Click or drag a file to this area to import": "单击或拖动文件到此区域进行导入", + "Create And Edit BPMN": "创建和编辑 BPMN", + "Create And Edit DMN": "创建和编辑 DMN", + "Import New": "导入新内容", } From dbc581170c35e774956ff71b9b56d39fd7b663c2 Mon Sep 17 00:00:00 2001 From: Ajay krishna Date: Fri, 17 Jan 2025 22:44:32 +0530 Subject: [PATCH 4/8] sonar issue fix --- .../src/components/CustomComponents/TableFooter.tsx | 1 - forms-flow-theme/scss/_button.scss | 2 +- forms-flow-theme/scss/_table.scss | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/forms-flow-components/src/components/CustomComponents/TableFooter.tsx b/forms-flow-components/src/components/CustomComponents/TableFooter.tsx index 5d7768651..f2262c093 100644 --- a/forms-flow-components/src/components/CustomComponents/TableFooter.tsx +++ b/forms-flow-components/src/components/CustomComponents/TableFooter.tsx @@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next"; import Pagination from "react-js-pagination"; import { Dropdown } from "react-bootstrap"; import { DownArrowIcon, AngleLeftIcon, AngleRightIcon } from "../SvgIcons/index"; -import { StyleServices } from "@formsflow/service"; interface PageOption { value: number; text: string; diff --git a/forms-flow-theme/scss/_button.scss b/forms-flow-theme/scss/_button.scss index 2683578ba..f300becf4 100644 --- a/forms-flow-theme/scss/_button.scss +++ b/forms-flow-theme/scss/_button.scss @@ -473,7 +473,7 @@ $btn-font-weight: bold; min-width: $dropdown-btn-size !important; min-height: $dropdown-btn-size !important; margin: 0 !important; - gap: var(--spacer-075) !important;; + gap: var(--spacer-075) !important; } .dropdown-toggle { diff --git a/forms-flow-theme/scss/_table.scss b/forms-flow-theme/scss/_table.scss index e1e2a9627..915ab9aab 100644 --- a/forms-flow-theme/scss/_table.scss +++ b/forms-flow-theme/scss/_table.scss @@ -8,7 +8,7 @@ $status-radius: 50%; .custom-tables-wrapper { height: auto; - max-height: calc(100vh - 4rem); + max-height: calc(100vh - 5.2rem); overflow-y: auto; overflow-x: hidden; border-radius: $tr-th-border-radius !important; From 87faeb57e86190d05e1605c9157f05ae9c154e1b Mon Sep 17 00:00:00 2001 From: fahad-aot Date: Mon, 20 Jan 2025 00:14:48 -0800 Subject: [PATCH 5/8] bugfix/fwf-4118:Added style changes for expression builder --- forms-flow-theme/scss/_modal.scss | 66 ++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/forms-flow-theme/scss/_modal.scss b/forms-flow-theme/scss/_modal.scss index 1a025fbdd..2888ce841 100644 --- a/forms-flow-theme/scss/_modal.scss +++ b/forms-flow-theme/scss/_modal.scss @@ -24,16 +24,16 @@ $secondary: var(--ff-secondary); opacity: 0; } - // for modals with size="sm" . 50% given to make it 750px as per figma size + // for modals with size="sm" . 63.5% given to make it 960px as per figma size &.modal-sm { - width: 50% !important; - max-width: 50% !important; + width: 63.5% !important; + max-width: 63.5% !important; } // for modals with size="lg" . 95% given to make it 1432px as per figma size &.modal-lg { - width: 95% !important; - max-width: 95% !important; + width: 95.2% !important; + max-width: 95.2% !important; } @@ -631,10 +631,23 @@ $secondary: var(--ff-secondary); //expression-builder-modal -.expression-builder{ - .expression-list-group { - width: 100%; +.expression-builder-modal { + .modal-content{ + margin-top: var(--spacer-100); + margin-bottom: var(--spacer-100); + max-height: calc(100vh - 2rem); + } + + .expression-section{ + border-bottom: 1px solid var(--ff-gray-100); + padding: var(--spacer-200) var(--spacer-225) !important; + gap: var(--spacer-050); } +} + .expression-builder{ + .expression-list-group { + width: 100%; +} .expression-list-group .form-variable { display: flex; @@ -684,8 +697,7 @@ $secondary: var(--ff-secondary); flex-wrap: wrap; } - .expression-section, - .variable-section { + .expression-section{ display: flex; padding: var(--spacer-200) var(--spacer-250); flex-direction: column; @@ -694,45 +706,54 @@ $secondary: var(--ff-secondary); } .variable-section { + display: flex; + flex-direction: column; + align-items: flex-start; + align-self: stretch; gap: var(--spacer-150); + max-height: calc(100vh - 35.875rem); + overflow-y: scroll; } .tab-label { font-size: var(--font-size-md); } - + .tab-variable-section{ + display: flex; + flex-direction: column; + padding: var(--spacer-200); + gap: var(--spacer-150); + } .tab-section { display: flex; align-items: center; gap: var(--spacer-150); - padding-left: var(--spacer-250); - padding-top: var(--spacer-200); + border-bottom: 1px solid var(--ff-gray-000); } .variable-tab { gap: var(--spacer-150); } - - .custom-value { - padding: 42px 24px 40px 40px; - } + .save-value { display: inline-flex; - justify-content: center; align-items: center; gap: var(--spacer-050); - padding-left: var(--spacer-250); - padding-bottom: var(--spacer-250); } .pick-operator { - padding: var(--spacer-200) var(--spacer-250) var(--spacer-150) var(--spacer-250); + display: flex; + flex-direction: column; + padding: var(--spacer-200); gap: var(--spacer-050); + max-height: calc(100vh - 26.375rem); + overflow-y: scroll; } .operator-list { width: 100%; + padding: var(--spacer-050) var(--spacer-100); } .operator-list:hover { @@ -808,7 +829,6 @@ $secondary: var(--ff-secondary); margin: 0; align-items: center; width: 100%; - padding-block: 1rem; gap: var(--spacer-050); .badge-pill { background-color: $primary !important; @@ -821,9 +841,9 @@ $secondary: var(--ff-secondary); .badge-pill { background-color: $primary !important; color: var(--ff-white) !important; - } } } +} From 8cd2248a33f3dc5059d149e08973325cf8779615 Mon Sep 17 00:00:00 2001 From: fahad-aot Date: Mon, 20 Jan 2025 01:34:07 -0800 Subject: [PATCH 6/8] comment updated --- forms-flow-theme/scss/_modal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms-flow-theme/scss/_modal.scss b/forms-flow-theme/scss/_modal.scss index 2888ce841..814d872f0 100644 --- a/forms-flow-theme/scss/_modal.scss +++ b/forms-flow-theme/scss/_modal.scss @@ -30,7 +30,7 @@ $secondary: var(--ff-secondary); max-width: 63.5% !important; } - // for modals with size="lg" . 95% given to make it 1432px as per figma size + // for modals with size="lg" . 95% given to make it 1440px as per figma size &.modal-lg { width: 95.2% !important; max-width: 95.2% !important; From 88f66e3d0df065195cb0914f40df13af028884b7 Mon Sep 17 00:00:00 2001 From: athul-aot Date: Mon, 20 Jan 2025 02:09:16 -0800 Subject: [PATCH 7/8] FWF-4179: [Bugfix] Added translation,resolved merge conflicts --- forms-flow-service/src/resourceBundles/bg/resourceBundles.ts | 1 + forms-flow-service/src/resourceBundles/de/resourceBundles.ts | 1 + forms-flow-service/src/resourceBundles/es/resourceBundles.ts | 2 ++ forms-flow-service/src/resourceBundles/fr/resourceBundles.ts | 1 + forms-flow-service/src/resourceBundles/pt/resourceBundles.ts | 1 + forms-flow-service/src/resourceBundles/zh/resourceBundles.ts | 1 + 6 files changed, 7 insertions(+) diff --git a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts index ea647a68a..769dc7cfa 100644 --- a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts @@ -1234,4 +1234,5 @@ export const RESOURCE_BUNDLES_BG = { "Confirm and Edit form": "Потвърдете и редактирайте формата", "Click or drag a file to this area to import": "Щракнете или плъзнете файл в тази област, за да го импортирате", "Import New": "Импортиране на ново", + "Search DMN Name": "Търсене на име DMN", } diff --git a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts index a160fa5b6..d03c6cb1f 100644 --- a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts @@ -1239,4 +1239,5 @@ export const RESOURCE_BUNDLES_DE = { "Create And Edit BPMN": "Erstellen und Bearbeiten von BPMN", "Create And Edit DMN": "Erstellen und Bearbeiten von DMN", "Import New": "Neu importieren", + "Search DMN Name": "DMN-Namen suchen", } diff --git a/forms-flow-service/src/resourceBundles/es/resourceBundles.ts b/forms-flow-service/src/resourceBundles/es/resourceBundles.ts index 1a4a8ec7d..e57dcf0a0 100644 --- a/forms-flow-service/src/resourceBundles/es/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/es/resourceBundles.ts @@ -722,4 +722,6 @@ export const RESOURCE_BUNDLES_ES = { "Confirm and Edit form": "Confirmar y editar formulario", "Click or drag a file to this area to import": "Haga clic o arrastre un archivo a esta área para importarlo", "Import New": "Importar Nuevo", + "Search DMN Name": "Buscar nombre DMN", + "Search BPMN Name": "Buscar nombre BPMN" } diff --git a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts index 203e81f5a..7479eaa93 100644 --- a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts @@ -1236,6 +1236,7 @@ export const RESOURCE_BUNDLES_FR ={ "Create And Edit BPMN": "Créer et modifier le BPMN", "Create And Edit DMN": "Créer et modifier le DMN", "Import New": "Importer un nouveau", + "Search DMN Name": "Rechercher le nom DMN", } diff --git a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts index 61546d1f8..80a4b67d0 100644 --- a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts @@ -1236,4 +1236,5 @@ export const RESOURCE_BUNDLES_PT ={ "Create And Edit BPMN": "Criar e Editar BPMN", "Create And Edit DMN": "Criar e Editar DMN", "Import New": "Importar Novo", + "Search DMN Name": "Pesquisar nome DMN", }; diff --git a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts index f0588de77..b5fc8a9ed 100644 --- a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts @@ -1223,4 +1223,5 @@ export const RESOURCE_BUNDLES_ZH = { "Create And Edit BPMN": "创建和编辑 BPMN", "Create And Edit DMN": "创建和编辑 DMN", "Import New": "导入新内容", + "Search DMN Name": "搜索 DMN 名称", } From efaee067366f0949940bbc99bde1caacf2251490 Mon Sep 17 00:00:00 2001 From: shuhaib s <95394061+shuhaib-aot@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:41:13 +0530 Subject: [PATCH 8/8] Added some keys for translations for formio (#427) --- forms-flow-service/src/formsflow-services.ts | 5 ++-- .../src/resourceBundles/bg/resourceBundles.ts | 5 ++++ .../src/resourceBundles/de/resourceBundles.ts | 5 ++++ .../src/resourceBundles/en/resourceBundles.ts | 16 ++++++++----- .../src/resourceBundles/es/resourceBundles.ts | 7 ++++++ .../resourceBundles/formioResourceBundle.ts | 24 +++++++++++++++++++ .../src/resourceBundles/fr/resourceBundles.ts | 5 ++++ .../src/resourceBundles/pt/resourceBundles.ts | 5 ++++ .../src/resourceBundles/zh/resourceBundles.ts | 7 +++++- 9 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 forms-flow-service/src/resourceBundles/formioResourceBundle.ts diff --git a/forms-flow-service/src/formsflow-services.ts b/forms-flow-service/src/formsflow-services.ts index 24073d5a5..9eb2e4179 100644 --- a/forms-flow-service/src/formsflow-services.ts +++ b/forms-flow-service/src/formsflow-services.ts @@ -3,6 +3,7 @@ import StorageService from "./storage/storageService"; import RequestService from "./request/requestService"; import i18nService from "./resourceBundles/i18n"; import HelperServices from "./helpers/helperServices"; -import StyleServices from "./helpers/styleService" +import StyleServices from "./helpers/styleService"; +import formioResourceBundle from "./resourceBundles/formioResourceBundle"; -export { KeycloakService, StorageService, RequestService, i18nService, HelperServices, StyleServices }; +export { KeycloakService, StorageService, RequestService, i18nService, HelperServices, StyleServices, formioResourceBundle }; diff --git a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts index cb4580629..2f71c0df0 100644 --- a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts @@ -1209,4 +1209,9 @@ export const RESOURCE_BUNDLES_BG = { "New Form Description": "Ново описание на формуляра", "Save and Edit form": "Запазване и редактиране на формуляра", "Build New Form": "Създай нов формуляр", + "cancel": "Отмени", + "previous": "Предишна", + "next": "Следваща", + "Month": "Месец", + "Year": "Година" } diff --git a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts index 6cb058116..3066b2ee7 100644 --- a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts @@ -1214,4 +1214,9 @@ export const RESOURCE_BUNDLES_DE = { "New Form Description": "Neue Formularbeschreibung", "Save and Edit form": "Formular speichern und bearbeiten", "Build New Form": "Neues Formular erstellen", + "cancel": "abbrechen", + "previous": "vorherige", + "next": "nächste", + "Month": "Monat", + "Year": "Jahr" } diff --git a/forms-flow-service/src/resourceBundles/en/resourceBundles.ts b/forms-flow-service/src/resourceBundles/en/resourceBundles.ts index 2cd5b0df5..1b7e40ce7 100644 --- a/forms-flow-service/src/resourceBundles/en/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/en/resourceBundles.ts @@ -711,10 +711,14 @@ export const RESOURCE_BUNDLES_EN ={ "Tenant not found":"Tenant not found", "Access Roles" :"Access Roles", "Description of the new form": "Description of the new form", - "Name of the form": "Name of the form", - "Duplicate": "Duplicate", - "New Form Name": "New Form Name", - "New Form Description": "New Form Description", - "Save and Edit form": "Save and Edit form", - "Build New Form": "Build New Form" + "Name of the form": "Name of the form", + "Duplicate": "Duplicate", + "New Form Name": "New Form Name", + "New Form Description": "New Form Description", + "Save and Edit form": "Save and Edit form", + "Build New Form": "Build New Form", + "Date / Time": "Date / Time", + "Month": "Month", + "Day": "Day", + "Year": "Year" } diff --git a/forms-flow-service/src/resourceBundles/es/resourceBundles.ts b/forms-flow-service/src/resourceBundles/es/resourceBundles.ts index c10539899..8625f0468 100644 --- a/forms-flow-service/src/resourceBundles/es/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/es/resourceBundles.ts @@ -698,4 +698,11 @@ export const RESOURCE_BUNDLES_ES = { "New Form Description": "Nueva descripción del formulario", "Save and Edit form": "Guardar y editar formulario", "Build New Form": "Crear nuevo formulario", + "cancel": "cancelar", + "previous": "anterior", + "next": "siguiente", + "Date / Time": "Fecha / Hora", + "Month": "Mes", + "Day": "Día", + "Year": "Año" } diff --git a/forms-flow-service/src/resourceBundles/formioResourceBundle.ts b/forms-flow-service/src/resourceBundles/formioResourceBundle.ts new file mode 100644 index 000000000..cf05c183a --- /dev/null +++ b/forms-flow-service/src/resourceBundles/formioResourceBundle.ts @@ -0,0 +1,24 @@ +/* ----------- // This file is dedicated to managing specific translations for Formio.---------- */ +export default { + "bg": { + "submit": "Изпрати формуляр" + }, + "de": { + + "submit": "Formular senden" + }, + "es": { + "submit": "enviar formulario" + }, + "fr": { + + "submit": "soumettre le formulaire" + }, + "pt": { + "submit": "enviar formulário" + }, + "zh-CN": { + "submit": "提交表单" + } + +} \ No newline at end of file diff --git a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts index 2b114d3a6..fb90fe4f1 100644 --- a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts @@ -1212,6 +1212,11 @@ export const RESOURCE_BUNDLES_FR ={ "New Form Description": "Nouvelle description de formulaire", "Save and Edit form": "Enregistrer et modifier le formulaire", "Build New Form": "Créer un nouveau formulaire", + "cancel": "annuler", + "previous": "précédent", + "next": "suivant", + "Month": "Mois", + "Year": "Année" } diff --git a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts index c0b7d2dec..7747f3863 100644 --- a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts @@ -1211,4 +1211,9 @@ export const RESOURCE_BUNDLES_PT ={ "New Form Description": "Nova descrição do formulário", "Save and Edit form": "Salvar e Editar formulário", "Build New Form": "Criar novo formulário", + "cancel": "cancelar", + "previous": "anterior", + "next": "próximo", + "Month": "Mês", + "Year": "Ano" }; diff --git a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts index 68fa4fca6..f8db23eae 100644 --- a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts @@ -1197,5 +1197,10 @@ export const RESOURCE_BUNDLES_ZH = { "New Form Name": "新表单名称", "New Form Description": "新表单描述", "Save and Edit form": "保存并编辑表单", - "Build New Form": "创建新表单" + "Build New Form": "创建新表单", + "cancel": "取消", + "previous": "上一页", + "next": "下一页", + "Month": "月", + "Year": "年" }