1
0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00

ProjectMemberWidget live data (#3013)

ProjectMemberWidget live data
Styling fixes.
Refactored  toggle type widget

Signed-off-by: andreas-unleash <andreas@getunleash.ai>
![Screenshot 2023-01-27 at 15 36
49](https://user-images.githubusercontent.com/104830839/215104757-8989591e-4c20-496c-9a69-93c8cd58172f.png)

<!-- Thanks for creating a PR! To make it easier for reviewers and
everyone else to understand what your changes relate to, please add some
relevant content to the headings below. Feel free to ignore or delete
sections that you don't think are relevant. Thank you! ❤️ -->

## About the changes
<!-- Describe the changes introduced. What are they and why are they
being introduced? Feel free to also add screenshots or steps to view the
changes if they're visual. -->

<!-- Does it close an issue? Multiple? -->
Closes #

<!-- (For internal contributors): Does it relate to an issue on public
roadmap? -->
<!--
Relates to [roadmap](https://github.com/orgs/Unleash/projects/10) item:
#
-->

### Important files
<!-- PRs can contain a lot of changes, but not all changes are equally
important. Where should a reviewer start looking to get an overview of
the changes? Are any files particularly important? -->


## Discussion points
<!-- Anything about the PR you'd like to discuss before it gets merged?
Got any questions or doubts? -->

---------

Signed-off-by: andreas-unleash <andreas@getunleash.ai>
This commit is contained in:
andreas-unleash 2023-01-31 15:20:16 +02:00 committed by GitHub
parent dc8c95702f
commit a91089d904
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 96 additions and 78 deletions

View File

@ -53,8 +53,8 @@ export const StyledWidgetTitle = styled('p')(({ theme }) => ({
export const StyledParagraphGridRow = styled('div')(({ theme }) => ({
display: 'grid',
gridGap: theme.spacing(1),
gridTemplateColumns: `${theme.spacing(1.25)} auto auto`,
gridGap: theme.spacing(1.5),
gridTemplateColumns: `${theme.spacing(1.25)} auto auto`, //20px auto auto
margin: theme.spacing(1, 0, 1, 0),
fontSize: theme.fontSizes.smallBody,
color: theme.palette.text.secondary,

View File

@ -7,6 +7,7 @@ import { ToggleTypesWidget } from './ToggleTypesWidget';
import { MetaWidget } from './MetaWidget';
import { ProjectMembersWidget } from './ProjectMembersWidget';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import { ProjectStatsSchema } from '@server/openapi';
import { ChangeRequestsWidget } from './ChangeRequestsWidget';
interface IProjectInfoProps {
@ -15,6 +16,7 @@ interface IProjectInfoProps {
features: IFeatureToggleListItem[];
health: number;
description?: string;
stats: ProjectStatsSchema;
}
const ProjectInfo = ({
@ -23,6 +25,7 @@ const ProjectInfo = ({
memberCount,
health,
features,
stats,
}: IProjectInfoProps) => {
const { uiConfig, isEnterprise } = useUiConfig();
@ -52,6 +55,7 @@ const ProjectInfo = ({
<ProjectMembersWidget
projectId={id}
memberCount={memberCount}
change={stats?.projectMembersAddedCurrentWindow}
/>
}
/>

View File

@ -1,21 +1,21 @@
import {
StyledArrowIcon,
StyledProjectInfoWidgetContainer,
StyledLink,
StyledParagraphEmphasizedText,
StyledWidgetTitle,
StyledProjectInfoWidgetContainer,
StyledSpanLinkText,
} from './ProjectInfo.styles';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import { StatusBox } from '../ProjectStats/StatusBox';
interface IProjectMembersWidgetProps {
projectId: string;
memberCount: number;
change?: number;
}
export const ProjectMembersWidget = ({
projectId,
memberCount,
change = 0,
}: IProjectMembersWidgetProps) => {
const { uiConfig } = useUiConfig();
@ -26,14 +26,19 @@ export const ProjectMembersWidget = ({
}
return (
<StyledProjectInfoWidgetContainer>
<StyledWidgetTitle data-loading>Project members</StyledWidgetTitle>
<StyledParagraphEmphasizedText data-loading>
{memberCount}
</StyledParagraphEmphasizedText>
<StyledProjectInfoWidgetContainer
sx={{ padding: theme => theme.spacing(0, 0, 3, 0) }}
>
<StatusBox
title={'Project members'}
boxText={`${memberCount}`}
change={change}
fullWidthBodyText
/>
<StyledLink data-loading to={link}>
<StyledSpanLinkText data-loading>view more </StyledSpanLinkText>
<StyledArrowIcon data-loading />
<StyledSpanLinkText data-loading>
View all members
</StyledSpanLinkText>
</StyledLink>
</StyledProjectInfoWidgetContainer>
);

View File

@ -1,13 +1,14 @@
import { useMemo } from 'react';
import { styled } from '@mui/material';
import { styled, SvgIconTypeMap } from '@mui/material';
import type { IFeatureToggleListItem } from 'interfaces/featureToggle';
import { getFeatureTypeIcons } from 'utils/getFeatureTypeIcons';
import {
StyledCount,
StyledProjectInfoWidgetContainer,
StyledParagraphGridRow,
StyledProjectInfoWidgetContainer,
StyledWidgetTitle,
} from './ProjectInfo.styles';
import { OverridableComponent } from '@mui/material/OverridableComponent';
export interface IToggleTypesWidgetProps {
features: IFeatureToggleListItem[];
@ -17,74 +18,66 @@ const StyledTypeCount = styled(StyledCount)(() => ({
marginLeft: 'auto',
}));
const StyledDiv = styled('div')(({ theme }) => ({
marginLeft: theme.spacing(1.5),
}));
interface IToggleTypeRowProps {
type: string;
Icon: OverridableComponent<SvgIconTypeMap>;
count: number;
}
const ToggleTypesRow = ({ type, Icon, count }: IToggleTypeRowProps) => {
const getTitleText = (str: string) => {
return str.charAt(0).toUpperCase() + str.slice(1).replace('-', ' ');
};
return (
<StyledParagraphGridRow data-loading>
<Icon fontSize="small" data-loading />
<div>{getTitleText(type)}</div>
<StyledTypeCount>{count}</StyledTypeCount>
</StyledParagraphGridRow>
);
};
export const ToggleTypesWidget = ({ features }: IToggleTypesWidgetProps) => {
const { release, experiment, operational, kill, permission } =
useMemo(() => {
const release =
features?.filter(feature => feature.type === 'release')
.length || 0;
const experiment =
features?.filter(feature => feature.type === 'experiment')
.length || 0;
const operational =
features?.filter(feature => feature.type === 'operational')
.length || 0;
const kill =
features?.filter(feature => feature.type === 'kill-switch')
.length || 0;
const permission =
features?.filter(feature => feature.type === 'permission')
.length || 0;
const featureTypeStats = useMemo(() => {
const release =
features?.filter(feature => feature.type === 'release').length || 0;
const experiment =
features?.filter(feature => feature.type === 'experiment').length ||
0;
const operational =
features?.filter(feature => feature.type === 'operational')
.length || 0;
const kill =
features?.filter(feature => feature.type === 'kill-switch')
.length || 0;
const permission =
features?.filter(feature => feature.type === 'permission').length ||
0;
return {
release,
experiment,
operational,
kill,
permission,
};
}, [features]);
const ReleaseToggleIcon = getFeatureTypeIcons('release');
const ExperimentToggleIcon = getFeatureTypeIcons('experiment');
const OperationalToggleIcon = getFeatureTypeIcons('operational');
const KillToggleIcon = getFeatureTypeIcons('kill-switch');
const PermissionToggleIcon = getFeatureTypeIcons('permission');
return {
release,
experiment,
operational,
'kill-switch': kill,
permission,
};
}, [features]);
return (
<StyledProjectInfoWidgetContainer>
<StyledProjectInfoWidgetContainer
sx={{ padding: theme => theme.spacing(3) }}
>
<StyledWidgetTitle data-loading>
Toggle types used
</StyledWidgetTitle>
<StyledParagraphGridRow data-loading>
<ReleaseToggleIcon fontSize="small" data-loading />
<StyledDiv>Release</StyledDiv>
<StyledTypeCount>{release}</StyledTypeCount>
</StyledParagraphGridRow>
<StyledParagraphGridRow data-loading>
<ExperimentToggleIcon fontSize="small" data-loading />
<StyledDiv>Experiment</StyledDiv>
<StyledTypeCount>{experiment}</StyledTypeCount>
</StyledParagraphGridRow>
<StyledParagraphGridRow data-loading>
<OperationalToggleIcon fontSize="small" data-loading />
<StyledDiv>Operational</StyledDiv>
<StyledTypeCount>{operational}</StyledTypeCount>
</StyledParagraphGridRow>
<StyledParagraphGridRow data-loading>
<KillToggleIcon fontSize="small" data-loading />
<StyledDiv>Kill switch</StyledDiv>
<StyledTypeCount>{kill}</StyledTypeCount>
</StyledParagraphGridRow>
<StyledParagraphGridRow data-loading style={{ margin: 0 }}>
<PermissionToggleIcon fontSize="small" data-loading />
<StyledDiv>Permission</StyledDiv>
<StyledTypeCount>{permission}</StyledTypeCount>
</StyledParagraphGridRow>
{Object.keys(featureTypeStats).map(type => (
<ToggleTypesRow
type={type}
Icon={getFeatureTypeIcons(type)}
count={
featureTypeStats[type as keyof typeof featureTypeStats]
}
/>
))}
</StyledProjectInfoWidgetContainer>
);
};

View File

@ -39,7 +39,8 @@ const ProjectOverview = () => {
const { project, loading } = useProject(projectId, {
refreshInterval,
});
const { members, features, health, description, environments } = project;
const { members, features, health, description, environments, stats } =
project;
usePageTitle(`Project overview ${projectName}`);
const { setLastViewed } = useLastViewedProject();
const { uiConfig } = useUiConfig();
@ -57,6 +58,7 @@ const ProjectOverview = () => {
memberCount={members}
health={health}
features={features}
stats={stats}
/>
<StyledContentContainer>
<ConditionallyRender

View File

@ -56,6 +56,7 @@ interface IStatusBoxProps {
boxText: string;
change: number;
percentage?: boolean;
fullWidthBodyText?: boolean;
}
const resolveIcon = (change: number) => {
@ -81,17 +82,30 @@ export const StatusBox = ({
boxText,
change,
percentage,
fullWidthBodyText,
}: IStatusBoxProps) => {
return (
<StyledBox>
<StyledTypographyHeader>{title}</StyledTypographyHeader>
<Box sx={{ ...flexRow }}>
<Box
sx={{
...flexRow,
justifyContent: fullWidthBodyText
? 'space-between'
: 'center',
width: fullWidthBodyText ? '65%' : 'auto',
}}
>
<StyledTypographyCount>{boxText}</StyledTypographyCount>
<ConditionallyRender
condition={change !== 0}
show={
<StyledBoxChangeContainer>
<Box sx={{ ...flexRow }}>
<Box
sx={{
...flexRow,
}}
>
{resolveIcon(change)}
<StyledTypographyChange
color={resolveColor(change)}