From 64ea409f60cc7a3a8d25ec98e8c57f6e22541a5d Mon Sep 17 00:00:00 2001 From: abishekTa-egov Date: Mon, 16 Dec 2024 18:04:56 +0530 Subject: [PATCH] FEATURE/HCMPRE-1642 : Show TotalCount next to tab name in UI (#2043) * For showing count next to tab * package update * Changes * putting showTabLabels in config * Removed extra logic * Removed extra logic * Changed name from Tablabel to Tabcount * changes --- micro-ui/web/core/package.json | 2 +- micro-ui/web/micro-ui-internals/example/package.json | 2 +- micro-ui/web/micro-ui-internals/package.json | 2 +- .../micro-ui-internals/packages/modules/core/package.json | 2 +- .../micro-ui-internals/packages/modules/sandbox/package.json | 2 +- .../packages/modules/utilities/package.json | 2 +- .../packages/react-components/package.json | 2 +- .../packages/react-components/src/atoms/SearchComponent.js | 5 +++-- .../packages/react-components/src/hoc/InboxSearchComposer.js | 4 ++++ micro-ui/web/package.json | 2 +- micro-ui/web/sandbox/package.json | 2 +- micro-ui/web/workbench/package.json | 2 +- 12 files changed, 17 insertions(+), 12 deletions(-) diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json index 342edfcdb4e..2b742ce7c25 100644 --- a/micro-ui/web/core/package.json +++ b/micro-ui/web/core/package.json @@ -23,7 +23,7 @@ "@egovernments/digit-ui-module-open-payment":"0.0.1", "@egovernments/digit-ui-module-hrms": "1.8.10", "@egovernments/digit-ui-module-pgr": "1.8.10", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "babel-loader": "8.1.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json index 1de9df757ea..2ca3acd3ed3 100644 --- a/micro-ui/web/micro-ui-internals/example/package.json +++ b/micro-ui/web/micro-ui-internals/example/package.json @@ -20,7 +20,7 @@ "@egovernments/digit-ui-module-open-payment":"0.0.1", "@egovernments/digit-ui-module-engagement": "1.5.20", "@egovernments/digit-ui-components":"0.0.2-beta.58", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "@egovernments/digit-ui-module-sandbox": "0.0.1", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json index 691c00af25e..f8f56d67ac2 100644 --- a/micro-ui/web/micro-ui-internals/package.json +++ b/micro-ui/web/micro-ui-internals/package.json @@ -74,7 +74,7 @@ "lodash": "4.17.21", "microbundle-crl": "0.13.11", "@egovernments/digit-ui-components":"0.0.2-beta.58", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "react": "17.0.2", "react-dom": "17.0.2", "react-hook-form": "6.15.8", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json index ec80f9cdf70..ed202888466 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@egovernments/digit-ui-components":"0.0.2-beta.58", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "react": "17.0.2", "react-dom": "17.0.2", "react-i18next": "11.16.2", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json index 18a274c386c..36c247c7202 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json @@ -18,7 +18,7 @@ "react-router-dom": "5.3.0" }, "dependencies": { - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "@egovernments/digit-ui-components":"0.0.2-beta.58", "react": "17.0.2", "react-date-range": "^1.4.0", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json b/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json index 8d8bad66156..61017e5096c 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json +++ b/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json @@ -20,7 +20,7 @@ "dependencies": { "@cyntler/react-doc-viewer": "1.10.3", "@egovernments/digit-ui-components":"0.0.2-beta.58", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "axios": "^1.7.2", "react": "17.0.2", "react-date-range": "^1.4.0", diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/package.json b/micro-ui/web/micro-ui-internals/packages/react-components/package.json index fca871aa99f..cc6bc119810 100644 --- a/micro-ui/web/micro-ui-internals/packages/react-components/package.json +++ b/micro-ui/web/micro-ui-internals/packages/react-components/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-react-components", - "version": "1.8.12", + "version": "1.8.13", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js index d192abb9b3e..f2352073736 100644 --- a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js +++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SearchComponent.js @@ -16,7 +16,7 @@ const setUIConf = (uiConfig) => { return [{uiConfig}] } -const SearchComponent = ({ uiConfig, header = "", screenType = "search", fullConfig, data,activeLink,setActiveLink,browserSession,showTab, tabData, onTabChange}) => { +const SearchComponent = ({ uiConfig, header = "", screenType = "search", fullConfig, data,activeLink,setActiveLink,browserSession,showTab,showTabCount=false, tabData, onTabChange}) => { //whenever activeLink changes we'll change uiConfig // const [activeLink,setActiveLink] = useState(uiConfig?.configNavItems?.filter(row=>row.activeByDefault)?.[0]?.name) @@ -171,7 +171,8 @@ const SearchComponent = ({ uiConfig, header = "", screenType = "search", fullCon clearSearch({}); onTabChange(num); }}> - {t(i?.label)} + {showTabCount? `${t(i?.label)}(${data?.count || data?.TotalCount || data?.totalCount})` + : t(i?.label)} ))} diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js index 928804bfb6b..065aea9e4c2 100644 --- a/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js +++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/hoc/InboxSearchComposer.js @@ -184,6 +184,7 @@ const InboxSearchComposer = ({configs,headerLabel,additionalConfig,onFormValueCh fullConfig={configs} data={data} showTab={showTab} + showTabCount={configs?.sections?.search?.uiConfig?.showTabCount} tabData={tabData} onTabChange={onTabChange} /> @@ -200,6 +201,7 @@ const InboxSearchComposer = ({configs,headerLabel,additionalConfig,onFormValueCh screenType={configs.type} fullConfig={configs} data={data} + showTabCount={configs?.sections?.filter?.uiConfig?.showTabCount} /> } @@ -213,6 +215,7 @@ const InboxSearchComposer = ({configs,headerLabel,additionalConfig,onFormValueCh screenType={configs.type} fullConfig={configs} data={data} + showTabCount={configs?.sections?.search?.uiConfig?.showTabCount} /> @@ -227,6 +230,7 @@ const InboxSearchComposer = ({configs,headerLabel,additionalConfig,onFormValueCh screenType={configs.type} fullConfig={configs} data={data} + showTabCount={configs?.sections?.filter?.uiConfig?.showTabCount} /> diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json index 1208e372f7a..3c233515267 100644 --- a/micro-ui/web/package.json +++ b/micro-ui/web/package.json @@ -25,7 +25,7 @@ "@egovernments/digit-ui-module-open-payment":"0.0.1", "@egovernments/digit-ui-module-engagement": "1.5.20", "@egovernments/digit-ui-components":"0.0.2-beta.58", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "babel-loader": "8.1.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json index c15a389969c..36fc26ccff5 100644 --- a/micro-ui/web/sandbox/package.json +++ b/micro-ui/web/sandbox/package.json @@ -31,7 +31,7 @@ "@egovernments/digit-ui-module-engagement": "1.5.20", "@egovernments/digit-ui-components":"0.0.2-beta.58", "@egovernments/digit-ui-module-sandbox": "0.0.1", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "babel-loader": "8.1.0", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json index 6e44d2ca356..e2306d78c25 100644 --- a/micro-ui/web/workbench/package.json +++ b/micro-ui/web/workbench/package.json @@ -19,7 +19,7 @@ "@egovernments/digit-ui-components":"0.0.2-beta.58", "@egovernments/digit-ui-module-core": "1.8.12", "@egovernments/digit-ui-module-utilities": "1.0.1-beta.41", - "@egovernments/digit-ui-react-components": "1.8.12", + "@egovernments/digit-ui-react-components": "1.8.13", "babel-loader": "8.1.0", "react": "17.0.2", "react-dom": "17.0.2",