feat(company subscription): update API and fix tab UI scroll (#1131)

eclipse-tractusx · Sep 24, 2024 · f251717 · f251717
1 parent ffc6948
commit f251717
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Change
+
+- **Company Subscriptions**
+  - update API query parameters and fix tab UI scroll [#1131](https://github.com/eclipse-tractusx/portal-frontend/pull/1131)
+
 ### Bugfixes
 
 - **Connector Management**

diff --git a/src/components/pages/CompanySubscriptions/index.tsx b/src/components/pages/CompanySubscriptions/index.tsx
@@ -252,7 +252,7 @@ export default function CompanySubscriptions() {
         <Tabs
           value={currentActive}
           onChange={handleTabChange}
-          sx={{ margin: '0 18% 20px' }}
+          sx={{ margin: '0 auto 20px', maxWidth: '1110px', width: '100%' }}
         >
           <Tab
             iconPosition="start"

diff --git a/src/features/apps/apiSlice.ts b/src/features/apps/apiSlice.ts
@@ -176,11 +176,9 @@ export const apiSlice = createApi({
           body.args.statusId !== CompanySubscriptionFilterType.SHOW_ALL
             ? `&status=${body.args.statusId}`
             : ''
-        const companyName = body.args.expr
-          ? `&companyName=${body.args.expr}`
-          : ''
+        const name = body.args.expr ? `&name=${body.args.expr}` : ''
         return {
-          url: `${url}${statusId}${companyName}`,
+          url: `${url}${statusId}${name}`,
         }
       },
     }),

diff --git a/src/features/serviceSubscription/serviceSubscriptionApiSlice.ts b/src/features/serviceSubscription/serviceSubscriptionApiSlice.ts
@@ -212,11 +212,9 @@ export const apiSlice = createApi({
           body.args.statusId !== CompanySubscriptionFilterType.SHOW_ALL
             ? `&status=${body.args.statusId}`
             : ''
-        const companyName = body.args.expr
-          ? `&companyName=${body.args.expr}`
-          : ''
+        const name = body.args.expr ? `&name=${body.args.expr}` : ''
         return {
-          url: `${url}${statusId}${companyName}`,
+          url: `${url}${statusId}${name}`,
         }
       },
     }),