Skip to content

Commit d2e9fca

Browse files
amitamrutiyaamitamrutiya
authored
Merge branch 'master' into fix-styling-1
2 parents 671c593 + 132b998 commit d2e9fca

File tree

15 files changed

+4338
-2318
lines changed

15 files changed

+4338
-2318
lines changed

‎package-lock.json

Lines changed: 4301 additions & 2281 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,15 @@
7373
"redux": "^5.0.1",
7474
"rehype-raw": "^6.1.1",
7575
"remark-gfm": "^3.0.1",
76+
"rollup": "^4.34.8",
7677
"ts-jest": "^29.1.1",
7778
"tsup": "^8.2.4",
7879
"typescript": "^5.3.3"
7980
},
8081
"peerDependencies": {
8182
"@xstate/react": "^4.1.1",
82-
"react": ">=17",
83-
"react-dom": ">=17",
83+
"react": "^18.3.1",
84+
"react-dom": "^18.3.1",
8485
"xstate": "^5.18.2"
8586
},
8687
"peerDependenciesMeta": {
@@ -97,16 +98,16 @@
9798
"dependencies": {
9899
"@emotion/react": "^11.11.3",
99100
"@emotion/styled": "^11.11.0",
100-
"@mui/material": "^5.15.11",
101101
"@layer5/meshery-design-embed": "^0.4.0",
102+
"@mui/material": "^5.15.11",
103+
"@types/mui-datatables": "*",
102104
"billboard.js": "^3.14.3",
103105
"js-yaml": "^4.1.0",
104106
"lodash": "^4.17.21",
105107
"moment": "^2.30.1",
108+
"mui-datatables": "*",
106109
"re-resizable": "^6.10.3",
107110
"react-draggable": "^4.4.6",
108-
"react-share": "^5.1.0",
109-
"mui-datatables": "*",
110-
"@types/mui-datatables": "*"
111+
"react-share": "^5.1.0"
111112
}
112-
}
113+
}

‎src/actors/eventBus.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ export interface EventBusEvent<Type extends string, Data = unknown> {
1111
export type EventType<T> = T extends EventBusEvent<infer Type, any> ? Type : never;
1212

1313
// Helper type to extract payload type for a given event type
14-
export type DataType<T, Type extends string> = T extends EventBusEvent<Type, infer Data>
15-
? Data
16-
: never;
14+
export type DataType<T, Type extends string> =
15+
T extends EventBusEvent<Type, infer Data> ? Data : never;
1716

1817
// Generic EventBus class
1918
export class EventBus<T extends EventBusEvent<string, any>> {

‎src/custom/CatalogDesignTable/AuthorCell.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ const AuthorCell: React.FC<AuthorCellProps> = ({
2323
firstName && lastName
2424
? `${firstName} ${lastName}`
2525
: firstName
26-
? firstName
27-
: lastName
28-
? lastName
29-
: '';
26+
? firstName
27+
: lastName
28+
? lastName
29+
: '';
3030

3131
return (
3232
<Box sx={{ '& > img': { mr: 2, flexShrink: 0 } }}>

‎src/custom/CatalogDesignTable/CatalogDesignTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ export const CatalogDesignsTable: React.FC<CatalogDesignsTableProps> = ({
212212
tableBackgroundColor
213213
? tableBackgroundColor
214214
: theme.palette.mode === 'light'
215-
? theme.palette.background.default
216-
: theme.palette.background.secondary
215+
? theme.palette.background.default
216+
: theme.palette.background.secondary
217217
}
218218
/>
219219
</ErrorBoundary>

‎src/custom/Feedback/style.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,15 @@ export const FeedbackOptionButton = styled(Button)<FeedbackMessageProps>(({ them
256256
? BLACK
257257
: SNOW_WHITE
258258
: theme.palette.mode === 'dark'
259-
? DARK_JUNGLE_GREEN
260-
: DARK_SLATE_GRAY,
259+
? DARK_JUNGLE_GREEN
260+
: DARK_SLATE_GRAY,
261261
color: isOpen
262262
? theme.palette.mode === 'dark'
263263
? SNOW_WHITE
264264
: BLACK
265265
: theme.palette.mode === 'dark'
266-
? SNOW_WHITE
267-
: SNOW_WHITE,
266+
? SNOW_WHITE
267+
: SNOW_WHITE,
268268
fill: isOpen ? theme.palette.icon.default : SNOW_WHITE,
269269
stroke: isOpen ? theme.palette.icon.inverse : theme.palette.icon.brand,
270270
'&:hover': {

‎src/custom/PerformersSection/styles.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ export const StatusLabel = styled(Box)<StatusLabelProps>(({ labelType, theme })
243243
labelType === 'community'
244244
? 'rgba(122,132,142,.8)'
245245
: labelType === 'official'
246-
? theme.palette.background.cta?.default
247-
: theme.palette.text.brand,
246+
? theme.palette.background.cta?.default
247+
: theme.palette.text.brand,
248248
color: labelType === 'official' ? 'black' : 'white',
249249
paddingInline: '1rem',
250250
borderTopRightRadius: '1rem',

‎src/custom/ResourceDetailFormatters/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ export {
2121
CodeFormatter,
2222
CollapsibleSectionFormatter,
2323
ContainerFormatter,
24+
convertToReadableUnit,
25+
extractPodVolumnTables,
2426
KeyValueInRow,
2527
LabelFormatter,
2628
ListFormatter,
@@ -30,11 +32,9 @@ export {
3032
OperatorDataFormatter,
3133
OperatorDynamicFormatter,
3234
SecretFormatter,
35+
splitCamelCaseString,
3336
StatusFormatter,
3437
TableDataFormatter,
3538
TextWithLinkFormatter,
36-
convertToReadableUnit,
37-
extractPodVolumnTables,
38-
splitCamelCaseString,
3939
useResourceCleanData
4040
};

‎src/custom/ResourceDetailFormatters/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export const extractPodVolumnTables = (data: TableData[] | null): TableStructure
5353
nestedKey === 'defaultMode'
5454
? value?.toString()
5555
: nestedKey === 'sources' && _.isArray(value)
56-
? value?.length
57-
: JSON.stringify(value);
56+
? value?.length
57+
: JSON.stringify(value);
5858
});
5959
} else {
6060
baseData[key] = JSON.stringify(nestedData);

‎src/custom/UsersTable/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import UsersTable from './UsersTable';
22
import UserTableAvatarInfo from './UserTableAvatarInfo';
3-
export { UsersTable, UserTableAvatarInfo };
3+
export { UserTableAvatarInfo, UsersTable };

0 commit comments

Comments
 (0)