Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

front: fix items alignement #9226

Merged
merged 1 commit into from
Oct 10, 2024
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
12 changes: 10 additions & 2 deletions front/src/applications/stdcmV2/components/StdcmCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,17 @@ export type StdcmCardProps = {
disabled?: boolean;
title?: React.ReactNode;
children: React.ReactNode;
className?: string;
};

const StdcmCard = ({ name, hasTip = false, disabled = false, title, children }: StdcmCardProps) => (
const StdcmCard = ({
name,
hasTip = false,
disabled = false,
title,
children,
className = '',
}: StdcmCardProps) => (
<div className={cx('stdcm-v2-card', { 'has-tip': hasTip, disabled })}>
{name && (
<div
Expand All @@ -23,7 +31,7 @@ const StdcmCard = ({ name, hasTip = false, disabled = false, title, children }:
{title}
</div>
)}
<div className="stdcm-v2-card__body">{children}</div>
<div className={cx('stdcm-v2-card__body', `${className}`)}>{children}</div>
</div>
);

Expand Down
56 changes: 33 additions & 23 deletions front/src/applications/stdcmV2/components/StdcmConsist.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,33 +108,43 @@ const StdcmConsist = ({ setCurrentSimulationInputs, disabled = false }: StdcmCon
name={t('consist.consist')}
title={<ConsistCardTitle rollingStock={rollingStock} />}
disabled={disabled}
className="consist"
>
<div className="stdcm-v2-consist">
<div className="suggestions">
<ComboBox
id="tractionEngine"
label={t('consist.tractionEngine')}
value={filters.text.toUpperCase()}
onClick={onInputClick}
onChange={onInputChange}
autoComplete="off"
disabled={disabled}
suggestions={filteredRollingStockList}
getSuggestionLabel={(suggestion: LightRollingStockWithLiveries) => getLabel(suggestion)}
onSelectSuggestion={onSelectSuggestion}
/>
</div>
<div className="stdcm-v2-consist__properties d-flex justify-content-between">
<Input id="tonnage" label={t('consist.tonnage')} trailingContent="t" />
<Input id="length" label={t('consist.length')} trailingContent="m" />
</div>
<SpeedLimitByTagSelector
<div className="traction-engine">
<ComboBox
id="tractionEngine"
label={t('consist.tractionEngine')}
value={filters.text.toUpperCase()}
onClick={onInputClick}
onChange={onInputChange}
autoComplete="off"
disabled={disabled}
selectedSpeedLimitByTag={speedLimitByTag}
speedLimitsByTags={speedLimitsByTags}
dispatchUpdateSpeedLimitByTag={dispatchUpdateSpeedLimitByTag}
suggestions={filteredRollingStockList}
getSuggestionLabel={(suggestion: LightRollingStockWithLiveries) => getLabel(suggestion)}
onSelectSuggestion={onSelectSuggestion}
/>
</div>
<div className="stdcm-v2-consist__properties">
<Input
id="tonnage"
label={t('consist.tonnage')}
trailingContent="t"
inputFieldWrapperClassname="weight"
/>
<Input
id="length"
label={t('consist.length')}
trailingContent="m"
inputFieldWrapperClassname="length"
/>
</div>
<SpeedLimitByTagSelector
disabled={disabled}
selectedSpeedLimitByTag={speedLimitByTag}
speedLimitsByTags={speedLimitsByTags}
dispatchUpdateSpeedLimitByTag={dispatchUpdateSpeedLimitByTag}
className="speed-limit-by-tag-selector"
/>
</StdcmCard>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ const StdcmDefaultCard = ({
onClick,
disabled = false,
}: StdcmCardProps) => (
<StdcmCard hasTip={hasTip} disabled={disabled}>
<StdcmCard hasTip={hasTip} disabled={disabled} className="add-via">
<button type="button" onClick={onClick}>
<span className="stdcm-v2-default-card-icon ml-n1">{Icon}</span>
<span className="stdcm-v2-default-card-icon">{Icon}</span>
<span className="stdcm-v2-default-card-button">{text}</span>
</button>
</StdcmCard>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ const StdcmDestination = ({
name={t('trainPath.destination')}
title={<img src={DestinationIcon} alt="destination" className="stdcm-destination-icon" />}
disabled={disabled}
className="extremity"
>
<div className="stdcm-v2-destination">
<StdcmOperationalPoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ const StdcmOpSchedule = ({
);

return (
<div className="d-flex flex-column">
<div className="col-12 pr-1">
<>
<div className="arrival-type-select">
<Select
id={`select-${opId}`}
value={opScheduleTimeType}
Expand All @@ -116,7 +116,7 @@ const StdcmOpSchedule = ({
/>
</div>
{opScheduleTimeType === 'preciseTime' && (
<div className="d-flex pl-2 pr-1">
<div className="schedule">
{/* TODO: Remove empty onChange events once we fix the warning on ui-core side */}
<DatePicker
inputProps={{
Expand Down Expand Up @@ -166,7 +166,7 @@ const StdcmOpSchedule = ({
</div>
</div>
)}
</div>
</>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ const StdcmOperationalPoint = ({
}, [point]);

return (
<div className="flex">
<div className="suggestions col-9">
<div className="location-line">
<div className="col-9 ci-input">
<ComboBox
id={`${opPointId}-ci`}
label={t('trainPath.ci')}
Expand All @@ -148,7 +148,7 @@ const StdcmOperationalPoint = ({
disableDefaultFilter
/>
</div>
<div className="suggestions stdcm-v2-ch-selector w-100 px-1 pb-2 col-3">
<div className="col-3 p-0">
<Select
label={t('trainPath.ch')}
id={`${opPointId}-ch`}
Expand Down
35 changes: 17 additions & 18 deletions front/src/applications/stdcmV2/components/StdcmOrigin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,29 +90,28 @@ const StdcmOrigin = ({
<StdcmCard
name={t('trainPath.origin')}
title={<img src={OriginIcon} alt="origin" className="stdcm-origin-icon" />}
className="extremity"
disabled={disabled}
hasTip
>
<div className="stdcm-v2-origin__parameters">
<StdcmOperationalPoint
updatePoint={updateOriginPoint}
point={origin}
opPointId={origin?.id || 'origin'}
<StdcmOperationalPoint
updatePoint={updateOriginPoint}
point={origin}
opPointId={origin?.id || 'origin'}
disabled={disabled}
/>
{origin && (
<StdcmOpSchedule
onArrivalChange={onOriginArrivalChange}
onArrivalTypeChange={onOriginArrivalTypeChange}
onArrivalToleranceChange={onOriginToleranceChange}
opTimingData={originArrival}
opToleranceValues={originToleranceValues}
opScheduleTimeType={origin?.arrivalType || ArrivalTimeTypes.PRECISE_TIME}
disabled={disabled}
opId="origin-arrival"
/>
{origin && (
<StdcmOpSchedule
onArrivalChange={onOriginArrivalChange}
onArrivalTypeChange={onOriginArrivalTypeChange}
onArrivalToleranceChange={onOriginToleranceChange}
opTimingData={originArrival}
opToleranceValues={originToleranceValues}
opScheduleTimeType={origin?.arrivalType || ArrivalTimeTypes.PRECISE_TIME}
disabled={disabled}
opId="origin-arrival"
/>
)}
</div>
)}
</StdcmCard>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const StdcmStopType = ({ stopTypes, updatePathStepStopType }: StdcmStopTypeProps
const { t } = useTranslation('stdcm');

return (
<div className="stdcm-v2-via-stop-for selector">
<div className="stop-type-selector">
<Select
label={t('trainPath.type')}
id="type"
Expand Down
15 changes: 7 additions & 8 deletions front/src/applications/stdcmV2/components/StdcmVias.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,14 @@ const StdcmVias = ({ disabled = false, setCurrentSimulationInputs }: StdcmConfig
}
hasTip
disabled={disabled}
className="via"
>
<div className="stdcm-v2-vias">
<StdcmOperationalPoint
updatePoint={(e) => updatePathStepsList(e, pathStepIndex)}
point={pathStep}
opPointId={pathStep.id}
disabled={disabled}
/>
</div>
<StdcmOperationalPoint
updatePoint={(e) => updatePathStepsList(e, pathStepIndex)}
point={pathStep}
opPointId={pathStep.id}
disabled={disabled}
/>
{'uic' in pathStep && pathStep.uic !== -1 && (
<>
<StdcmStopType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type SpeedLimitByTagSelectorProps = {
selectedSpeedLimitByTag?: string;
speedLimitsByTags: string[];
dispatchUpdateSpeedLimitByTag: (newTag: string | null) => void;
className?: string;
};

export default function SpeedLimitByTagSelector({
Expand All @@ -21,6 +22,7 @@ export default function SpeedLimitByTagSelector({
selectedSpeedLimitByTag: speedLimitByTag,
speedLimitsByTags,
dispatchUpdateSpeedLimitByTag,
className = '',
}: SpeedLimitByTagSelectorProps) {
const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);

Expand All @@ -34,9 +36,12 @@ export default function SpeedLimitByTagSelector({
return (
<div className="osrd-config-item mb-3">
<div
className={cx('osrd-config-item-container', {
'd-flex align-items-center gap-10': condensed,
})}
className={
(cx('osrd-config-item-container', {
'd-flex align-items-center gap-10': condensed,
}),
className)
}
>
<Select
disabled={disabled}
Expand Down
Loading
Loading