Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 14 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sistent/sistent",
"version": "0.19.1",
"version": "0.20.0",
"description": "Reusable React Components and SVG Icons library",
"repository": {
"type": "git",
Expand Down Expand Up @@ -46,7 +46,7 @@
"@emotion/cache": "^11.14.0",
"@eslint/eslintrc": "^3.3.5",
"@eslint/js": "^10.0.1",
"@meshery/schemas": "^1.1.1",
"@meshery/schemas": "^1.2.0",
"@mui/icons-material": "^7.3.9",
"@reduxjs/toolkit": "^2.11.2",
"@testing-library/dom": "^10.4.1",
Expand Down
10 changes: 5 additions & 5 deletions src/custom/CatalogCard/CatalogCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,23 +91,23 @@ const CatalogCard: React.FC<CatalogCardProps> = ({
<MetricsContainerFront>
<MetricsDiv>
<DownloadIcon width={18} height={18} />
<MetricsCount>{pattern.download_count}</MetricsCount>
<MetricsCount>{pattern.downloadCount}</MetricsCount>
</MetricsDiv>
<MetricsDiv>
<CloneIcon width={18} height={18} fill={'#51636B'} />
<MetricsCount>{pattern.clone_count}</MetricsCount>
<MetricsCount>{pattern.cloneCount}</MetricsCount>
</MetricsDiv>
<MetricsDiv>
<OpenIcon width={18} height={18} fill={'#51636B'} />
<MetricsCount>{pattern.view_count}</MetricsCount>
<MetricsCount>{pattern.viewCount}</MetricsCount>
</MetricsDiv>
<MetricsDiv>
<DeploymentsIcon width={18} height={18} />
<MetricsCount>{pattern.deployment_count}</MetricsCount>
<MetricsCount>{pattern.deploymentCount}</MetricsCount>
</MetricsDiv>
<MetricsDiv>
<ShareIcon width={18} height={18} fill={'#51636B'} />
<MetricsCount>{pattern.share_count}</MetricsCount>
<MetricsCount>{pattern.shareCount}</MetricsCount>
</MetricsDiv>
</MetricsContainerFront>
</DesignInnerCard>
Expand Down
24 changes: 12 additions & 12 deletions src/custom/CatalogDesignTable/columnConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ export const colViews: ColView[] = [
['lastName', 'na'],
['createdAt', 'na'],
['updatedAt', 'l'],
['design_type', 'xs'],
['designType', 'xs'],
['class', 'l'],
['view_count', 'na'],
['download_count', 'na'],
['clone_count', 'na'],
['deployment_count', 'na'],
['share_count', 'na'],
['viewCount', 'na'],
['downloadCount', 'na'],
['cloneCount', 'na'],
['deploymentCount', 'na'],
['shareCount', 'na'],
['actions', 'xs']
];

Expand Down Expand Up @@ -169,7 +169,7 @@ export const createDesignColumns = ({
}
},
{
name: 'design_type',
name: 'designType',
label: 'Type',
options: {
filter: true,
Expand All @@ -187,39 +187,39 @@ export const createDesignColumns = ({
}
},
{
name: 'view_count',
name: 'viewCount',
label: 'Opens',
options: {
filter: false,
sort: true
}
},
{
name: 'download_count',
name: 'downloadCount',
label: 'Downloads',
options: {
filter: false,
sort: true
}
},
{
name: 'clone_count',
name: 'cloneCount',
label: 'Clones',
options: {
filter: false,
sort: true
}
},
{
name: 'deployment_count',
name: 'deploymentCount',
label: 'Deploys',
options: {
filter: false,
sort: true
}
},
{
name: 'share_count',
name: 'shareCount',
label: 'Shares',
options: {
filter: false,
Expand Down
10 changes: 5 additions & 5 deletions src/custom/CatalogDetail/MetricsDisplay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ interface MetricsDisplayProps {

const MetricsDisplay: React.FC<MetricsDisplayProps> = ({ details }) => {
const metrics: MetricItem[] = [
{ label: 'Opens', value: details.view_count },
{ label: 'Downloads', value: details.download_count },
{ label: 'Deploys', value: details.deployment_count },
{ label: 'Clones', value: details.clone_count },
{ label: 'Shares', value: details.share_count }
{ label: 'Opens', value: details.viewCount },
{ label: 'Downloads', value: details.downloadCount },
{ label: 'Deploys', value: details.deploymentCount },
{ label: 'Clones', value: details.cloneCount },
{ label: 'Shares', value: details.shareCount }
];

return (
Expand Down
20 changes: 10 additions & 10 deletions src/custom/CustomCatalog/CustomCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ export interface Pattern {
lastName?: string;
avatarUrl: string;
name: string;
download_count: number;
clone_count: number;
view_count: number;
deployment_count: number;
share_count: number;
downloadCount: number;
cloneCount: number;
viewCount: number;
deploymentCount: number;
shareCount: number;
userData?: {
version?: string;
avatarUrl?: string;
Expand Down Expand Up @@ -198,11 +198,11 @@ const CustomCatalogCard: React.FC<CatalogCardProps> = ({
{isDetailed && (
<MetricsContainerFront isDetailed={isDetailed}>
{[
{ Icon: DownloadIcon, count: pattern.download_count },
{ Icon: CloneIcon, count: pattern.clone_count },
{ Icon: OpenIcon, count: pattern.view_count },
{ Icon: DeploymentsIcon, count: pattern.deployment_count },
{ Icon: ShareIcon, count: pattern.share_count }
{ Icon: DownloadIcon, count: pattern.downloadCount },
{ Icon: CloneIcon, count: pattern.cloneCount },
{ Icon: OpenIcon, count: pattern.viewCount },
{ Icon: DeploymentsIcon, count: pattern.deploymentCount },
{ Icon: ShareIcon, count: pattern.shareCount }
].map(({ Icon, count }, index) => (
<MetricsDiv key={index}>
<Icon
Expand Down
10 changes: 5 additions & 5 deletions src/custom/PerformersSection/PerformersSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,27 @@ const METRICS: Record<MetricType, MetricConfig> = {
view: {
label: 'Most Opens',
id: 'open',
countKey: 'view_count'
countKey: 'viewCount'
},
clone: {
label: 'Most Clones',
id: 'clone',
countKey: 'clone_count'
countKey: 'cloneCount'
},
download: {
label: 'Most Downloads',
id: 'download',
countKey: 'download_count'
countKey: 'downloadCount'
},
deployment: {
label: 'Most Deploys',
id: 'deployments',
countKey: 'deployment_count'
countKey: 'deploymentCount'
},
share: {
label: 'Most Shares',
id: 'share',
countKey: 'share_count'
countKey: 'shareCount'
}
};

Expand Down
6 changes: 3 additions & 3 deletions src/custom/ResponsiveDataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ const ResponsiveDataTable = ({
'createdAt',
'deletedAt',
'lastLoginTime',
'joined_at',
'last_run',
'next_run'
'joinedAt',
'lastRun',
'nextRun'
].includes(col.name)
) {
col.options.customBodyRender = (value: string | number | boolean | object) => {
Expand Down
4 changes: 4 additions & 0 deletions src/custom/TeamTable/TeamTableConfiguration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import {
import { Team } from '../Workspaces/types';

// currently team does not support bulk team delete
// TODO(meshery-cloud#?): flip `team_ids` / `team_names` to camelCase once the
// server's bulk-delete handler lands dual-accept (camel + legacy snake).
// Deferred from Phase 2.K cascade to avoid a client-only flip that would break
// the outbound POST body.
interface DeleteTeamsBtnProps {
selected: any;
teams: Team[];
Expand Down
Loading
Loading