From 3d13548de41bcd2b20774476cdc929967b4e1c2b Mon Sep 17 00:00:00 2001 From: lavanya-bmw Date: Fri, 17 May 2024 12:00:34 +0530 Subject: [PATCH 1/5] update(app marketplace): add more and collapse button to category view --- CHANGELOG.md | 2 ++ src/assets/locales/de/main.json | 1 + src/assets/locales/en/main.json | 1 + .../components/AppListGroup/index.tsx | 25 ++++++++++++++----- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1397764a1..56c2573d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - updated overlay styling for connector configuration - Identity Provider Config - Added links on click of 'learn more' +- App marketplace + - Add more and collapse button to category view ### Bugfix diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index e551ab79a..3963a3857 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1997,6 +1997,7 @@ "decline": "Decline", "confirm": "Bestätigen", "more": "Mehr", + "collapse": "Zusammenbruch", "loadmore": "Mehr laden", "details": "Details", "close": "Schließen", diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json index 072b0f11e..9c085671a 100644 --- a/src/assets/locales/en/main.json +++ b/src/assets/locales/en/main.json @@ -1961,6 +1961,7 @@ "decline": "Decline", "confirm": "Confirm", "more": "More", + "collapse": "Collapse", "loadmore": "Load more", "details": "Details", "close": "Close", diff --git a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx index 54e3d7ef9..c3c3eb62e 100644 --- a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx +++ b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx @@ -32,26 +32,39 @@ export const AppListGroup = ({ }) => { const { t } = useTranslation() const [itemsShown, setItemsShown] = useState('4') - const itemsToShow = items.slice(0, Number(itemsShown)) const increaseItemsShown = () => { - setItemsShown((prevState) => { - return (Number(prevState) + 4).toString() + setItemsShown(() => { + return items.length.toString() + }) + } + + const CollapseItemsShown = () => { + setItemsShown(() => { + return (4).toString() }) } return ( <> = items.length} - onButtonClick={increaseItemsShown} + disabled={items.length <= 4} + onButtonClick={ + itemsToShow.length >= items.length + ? CollapseItemsShown + : increaseItemsShown + } /> Date: Fri, 17 May 2024 12:05:20 +0530 Subject: [PATCH 2/5] update(app marketplace): typo fix --- .../pages/AppMarketplace/components/AppListGroup/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx index c3c3eb62e..b7e661fba 100644 --- a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx +++ b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx @@ -40,7 +40,7 @@ export const AppListGroup = ({ }) } - const CollapseItemsShown = () => { + const collapseItemsShown = () => { setItemsShown(() => { return (4).toString() }) @@ -62,7 +62,7 @@ export const AppListGroup = ({ disabled={items.length <= 4} onButtonClick={ itemsToShow.length >= items.length - ? CollapseItemsShown + ? collapseItemsShown : increaseItemsShown } /> From d17f2a07e3a8fed13d8f1ccf41ce1d953c1d9a6d Mon Sep 17 00:00:00 2001 From: lavanya-bmw Date: Mon, 20 May 2024 12:42:23 +0530 Subject: [PATCH 3/5] update(app marketplace): code optimise --- .../components/AppListGroup/index.tsx | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx index b7e661fba..4dbd508ab 100644 --- a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx +++ b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx @@ -34,16 +34,15 @@ export const AppListGroup = ({ const [itemsShown, setItemsShown] = useState('4') const itemsToShow = items.slice(0, Number(itemsShown)) - const increaseItemsShown = () => { - setItemsShown(() => { - return items.length.toString() - }) - } - - const collapseItemsShown = () => { - setItemsShown(() => { - return (4).toString() - }) + const handleMoreAndCollapse = () => { + if (itemsToShow.length >= items.length) { + setItemsShown(() => { + return (4).toString() + }) + } else + setItemsShown(() => { + return items.length.toString() + }) } return ( @@ -60,11 +59,7 @@ export const AppListGroup = ({ category.replace(/\s+/g, '').toLowerCase() )} disabled={items.length <= 4} - onButtonClick={ - itemsToShow.length >= items.length - ? collapseItemsShown - : increaseItemsShown - } + onButtonClick={handleMoreAndCollapse} /> Date: Tue, 21 May 2024 13:17:59 +0530 Subject: [PATCH 4/5] update(app marketplace): feedback changes --- src/assets/locales/de/main.json | 2 +- .../components/AppListGroup/index.tsx | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json index 3963a3857..5b5ab151f 100644 --- a/src/assets/locales/de/main.json +++ b/src/assets/locales/de/main.json @@ -1997,7 +1997,7 @@ "decline": "Decline", "confirm": "Bestätigen", "more": "Mehr", - "collapse": "Zusammenbruch", + "collapse": "Einklappen", "loadmore": "Mehr laden", "details": "Details", "close": "Schließen", diff --git a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx index 4dbd508ab..899ddf398 100644 --- a/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx +++ b/src/components/pages/AppMarketplace/components/AppListGroup/index.tsx @@ -31,20 +31,9 @@ export const AppListGroup = ({ items: AppMarketplaceCard[] }) => { const { t } = useTranslation() - const [itemsShown, setItemsShown] = useState('4') + const [itemsShown, setItemsShown] = useState(4) const itemsToShow = items.slice(0, Number(itemsShown)) - const handleMoreAndCollapse = () => { - if (itemsToShow.length >= items.length) { - setItemsShown(() => { - return (4).toString() - }) - } else - setItemsShown(() => { - return items.length.toString() - }) - } - return ( <> { + setItemsShown(itemsToShow.length >= items.length ? 4 : items.length) + }} /> Date: Wed, 29 May 2024 11:29:04 +0530 Subject: [PATCH 5/5] update(app marketplace): add cahngelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e8c5475c..4597fb290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,9 @@ - Admin Credential - Credential Request Management Board Improvements - +- App marketplace + - Add more and collapse button to category view + ## 2.0.0 ### Change