Skip to content

Commit 2d27029

Browse files
feat(global): INFRA-1100 bump react to 18.3 and Next.js to latest (#6509)
* feat(global): INFRA-1100 make OSS apps work on latest next * feat: INFRA-1100 make submodules worn on latest next * feat(global): bump react to 18.x * deps(ui): bump storybook to latest * feat(condo): bump next to latest in condo * feat(condo): make condo buildable on Next@15 and React@18 * deps(condo): INFRA-1100 bump next to latest * deps(global): INFRA-1100 remove rc-table * deps(global): INFRA-1100 make condo work on latest Next * chore(global): INFRA-1100 sync yarn.lock * chore(global): INFRA-1100 bump next 15.4.5 -> 15.4.6 * chore(global): INFRA-1100 sync yarn.lock * chore(global): INFRA-1100 fix semgrep and deps linting issues * refactor(global): INFRA-1100 remove legacy recorder * refactor(global): INFRA-1100 remove redundant dep and temp disable windows build * chore(global): INFRA-1100 sync submodules to main
1 parent 1e90ce7 commit 2d27029

File tree

172 files changed

+4134
-7209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+4134
-7209
lines changed

.github/workflows/nodejs.condo.ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,9 @@ jobs:
284284
if: ${{ needs.detect-changes.outputs.open-condo == 'true' }}
285285
strategy:
286286
matrix:
287-
os: [ ubuntu-22.04, windows-latest ]
287+
# TODO: Fix windows "too many files open" runner issue
288+
# os: [ ubuntu-22.04, windows-latest ]
289+
os: [ ubuntu-22.04 ]
288290
node-version: [ 22.x ]
289291
python-version: [ 3.13 ]
290292
runs-on: ${{ matrix.os }}

.helm

Submodule .helm updated from 914e1af to 81b92ce

apps/address-service/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
"graphql-tag": "^2.12.6",
3434
"lodash": "^4.17.21",
3535
"openid-client": "4.7.4",
36-
"react": "^17.0.2",
36+
"react": "^18.3.1",
3737
"react-router-dom": "5.2.0",
3838
"uuid": "^8.3.0"
3939
},
4040
"devDependencies": {
4141
"@types/jest": "^29.5.14",
4242
"@types/node": "^22",
43-
"@types/react": "^17.0.2",
43+
"@types/react": "^18.3.1",
4444
"jest": "^29.7.0",
4545
"jest-jasmine2": "^29.7.0",
4646
"typescript": "^5.8.3"

apps/announcements

apps/billing-connector

apps/callcenter

apps/condo/domains/acquiring/components/AcquiringReceipt.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ const ReceiptSection: React.FC<IReceiptSectionProps> = ({ section, currencyCode
359359

360360
const InvoiceSection: React.FC<IInvoiceSectionProps> = ({ section, currencyCode }) => {
361361
const intl = useIntl()
362-
const InvoiceTitle = intl.formatMessage({ id: 'acquiringReceipt.invoice.title' }, pick(section, ['number', 'date']))
362+
const InvoiceTitle = intl.formatMessage({ id: 'acquiringReceipt.invoice.title' }, pick(section, 'number', 'date'))
363363
const TaxRegimeTitle = intl.formatMessage({ id: 'acquiringReceipt.taxRegime' })
364364
const TaxRegimeModeTitle = intl.formatMessage({ id: `acquiringReceipt.taxRegime.${section.taxRegime}` as FormatjsIntl.Message['ids'] })
365365

apps/condo/domains/analytics/components/TicketChartView.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { DownOutlined } from '@ant-design/icons'
21
import { TicketGroupedCounter } from '@app/condo/schema'
32
import styled from '@emotion/styled'
43
import { Skeleton, Typography, List } from 'antd'
54
import get from 'lodash/get'
65
import dynamic from 'next/dynamic'
76
import React, { useRef, useEffect, useState, useCallback } from 'react'
8-
import InfiniteScroll from 'react-infinite-scroller'
7+
import InfiniteScroll from 'react-infinite-scroll-component'
98

9+
import { ChevronDown } from '@open-condo/icons'
1010
import { useIntl } from '@open-condo/next/intl'
1111

1212
import TicketChart, {
@@ -62,7 +62,7 @@ const EMPTY_CONTAINER_STYLE: React.CSSProperties = {
6262
alignItems: 'start',
6363
}
6464

65-
const TicketChartView: React.FC<ITicketAnalyticsPageChartProps> = (props) => {
65+
const TicketChartView: React.FC<React.PropsWithChildren<ITicketAnalyticsPageChartProps>> = (props) => {
6666
const {
6767
children,
6868
data,
@@ -196,7 +196,7 @@ const TicketChartView: React.FC<ITicketAnalyticsPageChartProps> = (props) => {
196196
option={option}/>
197197
{barChartPagedRenderEnabled ? (
198198
<Button style={{ width: '100%', marginTop: 16 }} type='ghost' onClick={loadMore}>
199-
{LoadMoreTitle} <DownOutlined />
199+
{LoadMoreTitle} <ChevronDown />
200200
</Button>
201201
) : null}
202202
{children}
@@ -251,10 +251,11 @@ const TicketChartView: React.FC<ITicketAnalyticsPageChartProps> = (props) => {
251251
/>
252252
<ScrollContainer height={infiniteScrollContainerHeight}>
253253
<InfiniteScroll
254-
initialLoad={false}
255-
loadMore={loadMore}
256254
hasMore={hasMore}
257-
useWindow={false}>
255+
dataLength={seriesRef.current.length}
256+
next={loadMore}
257+
loader={null}
258+
>
258259
<List
259260
grid={{ gutter: 24, xs: 1, sm: 1, md: 1, lg: 1, xl: 2, xxl: 2 }}
260261
dataSource={seriesRef.current}

apps/condo/domains/analytics/components/TicketListView.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Skeleton, Table, TableColumnsType } from 'antd'
2-
import { TableProps as RcTableProps } from 'rc-table/lib/Table'
1+
import { Skeleton, Table, TableColumnsType, TableProps } from 'antd'
32
import React from 'react'
43

54
import { useIntl } from '@open-condo/next/intl'
@@ -14,7 +13,7 @@ interface ITicketAnalyticsPageListViewProps extends ITicketAnalyticsPageWidgetPr
1413
}
1514

1615
export const getScrollConfig = (isSmall: boolean) => {
17-
const config: RcTableProps['scroll'] & { scrollToFirstRowOnChange?: boolean } = {
16+
const config: TableProps<unknown>['scroll'] & { scrollToFirstRowOnChange?: boolean } = {
1817
scrollToFirstRowOnChange: true,
1918
}
2019

apps/condo/domains/analytics/components/charts/payment/dataMappers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const PaymentByPropertyDataMapper = (paidTitle: string): PaymentChart => new Pay
4545
table: (_, data, restTableOptions) => {
4646
const dataSource = []
4747

48-
const tableColumns = Object.entries(restTableOptions.translations).map(([key, title]) => ({
48+
const tableColumns = Object.entries(restTableOptions.translations as Record<string, string>).map(([key, title]) => ({
4949
key,
5050
title,
5151
dataIndex: key,

0 commit comments

Comments
 (0)