Merge branch 'main' into new/CPLP-3436/quick-links

eclipse-tractusx · Feb 19, 2024 · 85a4214 · 85a4214
2 parents cf7ed7b + 88bb57c
commit 85a4214
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 13 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -14,7 +14,7 @@ Link to Github issue.
 
 Please delete options that are not relevant.
 
-- [ ] I have followed the [contributing guidelines](https://github.com/eclipse-tractusx/portal-assets/blob/main/developer/Technical%20Documentation/Dev%20Process/How%20to%20contribute.md#commit-and-pr-guidelines)
+- [ ] I have followed the [contributing guidelines](https://github.com/eclipse-tractusx/portal-assets/blob/main/docs/developer/Technical%20Documentation/Dev%20Process/How%20to%20contribute.md#commit-and-pr-guidelines)
 - [ ] I have performed [IP checks](https://eclipse-tractusx.github.io/docs/release/trg-7/trg-7-04#checking-libraries-using-the-eclipse-dash-license-tool) for added or updated 3rd party libraries
 - [ ] I have created and linked IP issues or requested their creation by a committer
 - [ ] I have performed a self-review of my own code

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@
 
 - Fix quick links interface
 
+## 2.1.29
+
+- fix more button issue in page loading component
+
+## 2.1.28
+
+- upgrade node-ip package (transitive dependency over @storybook/core-server) to remove CVE-2023-42282
+- remove catenax-ng picture references
+
 ## 2.1.27
 
 - fix quick links style

diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -406,7 +406,7 @@ npm/npmjs/-/inflight/1.0.6, ISC, approved, clearlydefined
 npm/npmjs/-/inherits/2.0.4, ISC, approved, clearlydefined
 npm/npmjs/-/internal-slot/1.0.5, MIT, approved, #7118
 npm/npmjs/-/interpret/1.4.0, MIT, approved, clearlydefined
-npm/npmjs/-/ip/2.0.0, MIT, approved, clearlydefined
+npm/npmjs/-/ip/2.0.1, MIT, approved, #13289
 npm/npmjs/-/ipaddr.js/1.9.1, MIT, approved, clearlydefined
 npm/npmjs/-/is-absolute-url/3.0.3, MIT, approved, clearlydefined
 npm/npmjs/-/is-arguments/1.1.1, MIT, approved, clearlydefined

diff --git a/src/components/basic/Image/Image.stories.tsx b/src/components/basic/Image/Image.stories.tsx
@@ -101,7 +101,7 @@ const drawing = ((): string => {
 
 export const FromURL: StoryObj<typeof Component> = {
   args: {
-    src: 'https://raw.githubusercontent.com/catenax-ng/tx-portal-assets/main/public/assets/images/logos/cx-short.svg',
+    src: 'https://raw.githubusercontent.com/eclipse-tractusx/portal-assets/main/public/assets/images/logos/cx-short.svg',
     style,
   },
 }

diff --git a/src/components/basic/Table/PageLoadingTable.tsx b/src/components/basic/Table/PageLoadingTable.tsx
@@ -138,7 +138,7 @@ export const PageLoadingTable = function <Row, Args>({
         reload={refetch}
         {...props}
       />
-      {items.length > 0 && hasMore && (
+      {items.length > 0 && hasMore ? (
         <Box
           sx={{
             width: '100%',
@@ -150,6 +150,8 @@ export const PageLoadingTable = function <Row, Args>({
         >
           <LoadMoreButton label={loadLabel || 'load more'} onClick={nextPage} />
         </Box>
+      ) : (
+        <></>
       )}
     </>
   )

diff --git a/src/components/basic/Table/components/Helper/helper.ts b/src/components/basic/Table/components/Helper/helper.ts
@@ -36,11 +36,10 @@ export interface PageDataRows {
 
 export const hasMorePages = (data: PageDataProps) => {
   return (
-    (data.page && data.totalPages && data?.page < data?.totalPages - 1) ??
-    (data?.meta && data.meta.page < data.meta.totalPages - 1)
+    data?.meta && data.meta.page < data.meta.totalPages - 1
   )
 }
 
 export const getMaxRows = (data: PageDataRows) => {
-  return data?.totalElements ?? data?.meta?.totalElements ?? 0
+  return data?.meta?.totalElements ?? 0
 }
diff --git a/src/components/content/DemoComponents/CardGrid.stories.tsx b/src/components/content/DemoComponents/CardGrid.stories.tsx
@@ -29,7 +29,7 @@ export default meta
 export const Default: StoryObj<typeof Component> = {
   args: {
     baseUrl:
-      'https://raw.githubusercontent.com/catenax-ng/tx-portal-assets/main/public/assets/',
+      'https://raw.githubusercontent.com/eclipse-tractusx/portal-assets/main/public/assets/',
     align: 'center',
     provider: {
       detailsWithImageRow1: [

diff --git a/src/components/content/DemoComponents/FlexImages.stories.tsx b/src/components/content/DemoComponents/FlexImages.stories.tsx
@@ -29,7 +29,7 @@ export default meta
 export const Default: StoryObj<typeof Component> = {
   args: {
     baseUrl:
-      'https://raw.githubusercontent.com/catenax-ng/tx-portal-assets/main/public/assets/',
+      'https://raw.githubusercontent.com/eclipse-tractusx/portal-assets/main/public/assets/',
     provider: {
       images: [
         '/images/content/teaser.png',

diff --git a/src/components/content/DemoComponents/GridImages.stories.tsx b/src/components/content/DemoComponents/GridImages.stories.tsx
@@ -29,7 +29,7 @@ export default meta
 export const Default: StoryObj<typeof Component> = {
   args: {
     baseUrl:
-      'https://raw.githubusercontent.com/catenax-ng/tx-portal-assets/main/public/assets/',
+      'https://raw.githubusercontent.com/eclipse-tractusx/portal-assets/main/public/assets/',
     provider: {
       images: [
         '/images/content/teaser.png',

diff --git a/yarn.lock b/yarn.lock
@@ -6820,9 +6820,9 @@ interpret@^1.0.0:
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 [email protected]:
   version "1.9.1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,7 +101,7 @@ const drawing = ((): string => { @@
     export const FromURL: StoryObj<typeof Component> = {
       args: {
-        src: 'https://raw.githubusercontent.com/catenax-ng/tx-portal-assets/main/public/assets/images/logos/cx-short.svg',
+        src: 'https://raw.githubusercontent.com/eclipse-tractusx/portal-assets/main/public/assets/images/logos/cx-short.svg',
         style,
       },
     }
@@ Expand Down @@