Skip to content

Commit acde5ae

Browse files
authored
Hide piped disabled, show only when edit application (#5590)
Signed-off-by: kypham <hongkyhvnh@gmail.com>
1 parent 3b4f988 commit acde5ae

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

web/src/components/application-form/application-form-manual-v0/index.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ const ApplicationFormManualV0: FC<ApplicationFormProps> = ({
215215

216216
const classes = useStyles();
217217
const ps = useAppSelector((state) => selectAllPipeds(state));
218-
const pipeds = ps
219-
.filter((piped) => !piped.disabled)
218+
const pipedOptions = ps
219+
.filter((piped) => !piped.disabled || piped.id === detailApp?.pipedId)
220220
.sort((a, b) => sortFunc(a.name, b.name));
221221

222222
const selectedPiped = useAppSelector(selectPipedById(values.pipedId));
@@ -278,12 +278,13 @@ const ApplicationFormManualV0: FC<ApplicationFormProps> = ({
278278
pipedId: value,
279279
});
280280
}}
281-
options={pipeds.map((piped) => ({
281+
options={pipedOptions.map((piped) => ({
282282
label: `${piped.name} (${piped.id})`,
283283
value: piped.id,
284+
disabled: piped.disabled,
284285
}))}
285286
required
286-
disabled={isSubmitting || pipeds.length === 0}
287+
disabled={isSubmitting || pipedOptions.length === 0}
287288
/>
288289
<FormSelectInput
289290
id="platformProvider"

web/src/components/application-form/application-form-manual-v1/index.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ const ApplicationFormManualV1: FC<ApplicationFormProps> = ({
202202

203203
const classes = useStyles();
204204
const ps = useAppSelector((state) => selectAllPipeds(state));
205-
const pipeds = ps
206-
.filter((piped) => !piped.disabled)
205+
const pipedOptions = ps
206+
.filter((piped) => !piped.disabled || piped.id === detailApp?.pipedId)
207207
.sort((a, b) => sortFunc(a.name, b.name));
208208

209209
const selectedPiped = useAppSelector(selectPipedById(values.pipedId));
@@ -259,12 +259,13 @@ const ApplicationFormManualV1: FC<ApplicationFormProps> = ({
259259
pipedId: value,
260260
});
261261
}}
262-
options={pipeds.map((piped) => ({
262+
options={pipedOptions.map((piped) => ({
263263
label: `${piped.name} (${piped.id})`,
264264
value: piped.id,
265+
disabled: piped.disabled,
265266
}))}
266267
required
267-
disabled={isSubmitting || pipeds.length === 0}
268+
disabled={isSubmitting || pipedOptions.length === 0}
268269
/>
269270

270271
<FormControl variant="outlined">
@@ -275,7 +276,7 @@ const ApplicationFormManualV1: FC<ApplicationFormProps> = ({
275276
value={values.deployTargets.map(
276277
(item) => `${item.deployTarget} - ${item.pluginName}`
277278
)}
278-
disabled={isSubmitting || pipeds.length === 0}
279+
disabled={isSubmitting || pipedOptions.length === 0}
279280
onChange={(_e, value) => {
280281
const selected = deployTargetOptions.filter((item) =>
281282
value.includes(item.value)

web/src/components/application-form/application-form-v1/index.tsx

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@ const ApplicationFormSuggestionV1: FC<Props> = ({
147147
[apps, selectedPipedId]
148148
);
149149

150-
const pipeds = useMemo(() => {
151-
return ps.sort((a, b) => sortFunc(a.name, b.name));
150+
const pipedOptions = useMemo(() => {
151+
return ps
152+
.filter((piped) => !piped.disabled)
153+
.sort((a, b) => sortFunc(a.name, b.name));
152154
}, [ps]);
153155

154156
/**
@@ -171,10 +173,10 @@ const ApplicationFormSuggestionV1: FC<Props> = ({
171173
* Init selectedPipedId if there is only one piped
172174
*/
173175
useEffect(() => {
174-
if (pipeds.length === 1 && !selectedApp) {
175-
setSelectedPipedId(pipeds[0].id);
176+
if (pipedOptions.length === 1 && !selectedApp) {
177+
setSelectedPipedId(pipedOptions[0].id);
176178
}
177-
}, [pipeds, selectedApp]);
179+
}, [pipedOptions, selectedApp]);
178180

179181
/**
180182
* Init selectedApp if there is only one app
@@ -249,7 +251,7 @@ const ApplicationFormSuggestionV1: FC<Props> = ({
249251
onSelectPiped(e.target.value as string);
250252
}}
251253
>
252-
{pipeds.map((e) => (
254+
{pipedOptions.map((e) => (
253255
<MenuItem value={e.id} key={`piped-${e.id}`}>
254256
{e.name} ({e.id})
255257
</MenuItem>

web/src/components/form-select-input/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,11 @@ const FormSelectInput = <T extends BaseOption>({
8181
disabled={disabled}
8282
>
8383
{options.map((op) => (
84-
<MenuItem value={String(op.value)} key={String(op.value)}>
84+
<MenuItem
85+
value={String(op.value)}
86+
key={String(op.value)}
87+
disabled={!!op?.disabled}
88+
>
8589
{getOptionLabel(op)}
8690
</MenuItem>
8791
))}

0 commit comments

Comments
 (0)