Skip to content

Commit

Permalink
Adjusted according to review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenthoms committed May 30, 2024
1 parent b3d43ab commit fb1630c
Showing 1 changed file with 23 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ import {
import { resolveClassNames } from "@lib/utils/resolveClassNames";
import { convertRemToPixels } from "@lib/utils/screenUnitConversions";
import {
Attribution,
CheckCircle,

Check failure on line 27 in frontend/src/framework/internal/components/LeftSettingsPanel/private-components/modulesList.tsx

View workflow job for this annotation

GitHub Actions / frontend

'CheckCircle' is defined but never used
Close,
Code,

Check failure on line 29 in frontend/src/framework/internal/components/LeftSettingsPanel/private-components/modulesList.tsx

View workflow job for this annotation

GitHub Actions / frontend

'Code' is defined but never used
ExpandLess,
ExpandMore,
Help,
HistoryToggleOff,
Science,
WebAsset,
} from "@mui/icons-material";

Expand Down Expand Up @@ -206,8 +208,8 @@ const ModulesListItem: React.FC<ModulesListItemProps> = (props) => {
style={makeStyle(isDragged, dragSize, dragPosition)}
onMouseOver={handleHover}
>
<div ref={ref} className="px-2 flex items-center h-full text-sm gap-2">
<div className="h-12 w-12 overflow-hidden p-1">{makePreviewImage()}</div>
<div ref={ref} className="px-2 flex items-center h-full text-sm gap-2" title={props.displayName}>
<div className="h-12 w-12 min-w-12 overflow-hidden p-1 flex-shrink-0">{makePreviewImage()}</div>
<span className="flex-grow text-ellipsis whitespace-nowrap overflow-hidden">
{props.displayName}
</span>
Expand Down Expand Up @@ -264,8 +266,10 @@ function DevStatesFilter(props: DevStatesFilterProps): React.ReactNode {
<Checkbox
label={
<div className="flex gap-2 items-center">
<span className="text-green-600">{makeDevStateIcon(ModuleDevState.PROD)}</span>
Ready for user testing
<span className="text-green-600 flex items-center">
{makeDevStateIcon(ModuleDevState.PROD)}
</span>
<span className="mt-[0.2rem]">Ready for user testing</span>
</div>
}
onChange={() => handleFilterChange(ModuleDevState.PROD)}
Expand All @@ -275,7 +279,7 @@ function DevStatesFilter(props: DevStatesFilterProps): React.ReactNode {
label={
<div className="flex gap-2 items-center">
<span className="text-orange-600">{makeDevStateIcon(ModuleDevState.DEPRECATED)}</span>
Deprecated
<span className="mt-[0.2rem]">Deprecated</span>
</div>
}
onChange={() => handleFilterChange(ModuleDevState.DEPRECATED)}
Expand All @@ -284,8 +288,10 @@ function DevStatesFilter(props: DevStatesFilterProps): React.ReactNode {
<Checkbox
label={
<div className="flex gap-2 items-center">
<span className="text-teal-600">{makeDevStateIcon(ModuleDevState.DEV)}</span>
Under development
<span className="text-teal-600 inline-block align-middle">
{makeDevStateIcon(ModuleDevState.DEV)}
</span>
<span className="mt-[0.2rem]">Under development</span>
</div>
}
onChange={() => handleFilterChange(ModuleDevState.DEV)}
Expand Down Expand Up @@ -330,22 +336,22 @@ function ModulesListCategory(props: ModulesListCategoryProps): React.ReactNode {
function makeDevStateIcon(devState: ModuleDevState): React.ReactNode {
if (devState === ModuleDevState.PROD) {
return (
<span title="Ready for user testing">
<CheckCircle fontSize="inherit" />
<span title="Ready for user testing" className="inline-block align-middle text-base">
<Attribution fontSize="inherit" />
</span>
);
}
if (devState === ModuleDevState.DEPRECATED) {
return (
<span title="Deprecated">
<span title="Deprecated" className="inline-block align-middle text-base">
<HistoryToggleOff fontSize="inherit" />
</span>
);
}
if (devState === ModuleDevState.DEV) {
return (
<span title="Under development">
<Code fontSize="inherit" />
<span title="Under development" className="inline-block align-middle text-base">
<Science fontSize="inherit" />
</span>
);
}
Expand All @@ -364,25 +370,25 @@ function DetailsPopup(props: DetailsPopupProps): React.ReactNode {
function makeDevState(devState: ModuleDevState): React.ReactNode {
if (devState === ModuleDevState.PROD) {
return (
<div className="flex gap-1 text-green-600 text-xs items-center">
<div className="flex gap-2 text-green-600 text-xs items-center">
{makeDevStateIcon(devState)}
Ready for user testing
<span className="mt-[0.2rem]">Ready for user testing</span>
</div>
);
}
if (devState === ModuleDevState.DEPRECATED) {
return (
<div className="flex gap-1 text-orange-600 text-xs items-center">
<div className="flex gap-2 text-orange-600 text-xs items-center">
{makeDevStateIcon(devState)}
Deprecated
<span className="mt-[0.2rem]">Deprecated</span>
</div>
);
}
if (devState === ModuleDevState.DEV) {
return (
<div className="flex items-center gap-2 text-teal-600 text-xs">
{makeDevStateIcon(devState)}
Under development
<span className="mt-[0.2rem]">Under development</span>
</div>
);
}
Expand Down

0 comments on commit fb1630c

Please sign in to comment.