Skip to content

Commit e1fdf3f

Browse files
bexsoftBenjamin Perez
andauthored
Modals UI style changes (#331)
Implements new input styles & adjusts information on modal boxes for console. Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent e4510cb commit e1fdf3f

File tree

38 files changed

+2109
-968
lines changed

38 files changed

+2109
-968
lines changed

portal-ui/bindata_assetfs.go

Lines changed: 123 additions & 169 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

portal-ui/public/amqp.png

-77.3 KB
Loading

portal-ui/public/elasticsearch.png

-4.24 KB
Loading

portal-ui/public/kafka.png

295 Bytes
Loading

portal-ui/public/mqtt.png

1010 Bytes
Loading

portal-ui/public/mysql.png

12.8 KB
Loading

portal-ui/public/nats.png

18.4 KB
Loading

portal-ui/public/postgres.png

-256 KB
Loading

portal-ui/public/redis.png

13.4 KB
Loading

portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket.tsx

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ const AddBucket = ({
103103
const [bName, setBName] = useState<string>(bucketName);
104104
const [addLoading, setAddLoading] = useState<boolean>(false);
105105
const [addError, setAddError] = useState<string>("");
106+
const [sendEnabled, setSendEnabled] = useState<boolean>(false);
106107

107108
const addRecord = (event: React.FormEvent) => {
108109
event.preventDefault();
@@ -141,10 +142,34 @@ const AddBucket = ({
141142
const [value] = useDebounce(bName, 1000);
142143

143144
useEffect(() => {
144-
console.log("called");
145145
addBucketName(value);
146146
}, [value]);
147147

148+
const resetForm = () => {
149+
setBName("");
150+
addBucketVersioned(false);
151+
addBucketQuota(false);
152+
addBucketQuotaType("hard");
153+
addBucketQuotaSize("1");
154+
addBucketQuotaUnit("TiB");
155+
};
156+
157+
useEffect(() => {
158+
let valid = false;
159+
160+
if (bName.trim() !== "") {
161+
valid = true;
162+
}
163+
164+
if (enableQuota && valid) {
165+
if (quotaSize.trim() === "" || parseInt(quotaSize) === 0) {
166+
valid = false;
167+
}
168+
}
169+
170+
setSendEnabled(valid);
171+
}, [bName, versioned, quotaType, quotaSize, quotaUnit, enableQuota]);
172+
148173
return (
149174
<ModalWrapper
150175
title="Create Bucket"
@@ -196,7 +221,8 @@ const AddBucket = ({
196221
onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
197222
addBucketVersioned(event.target.checked);
198223
}}
199-
label={"Turn On Versioning"}
224+
label={"Versioning"}
225+
indicatorLabel={"On"}
200226
/>
201227
</Grid>
202228
<Grid item xs={12}>
@@ -209,6 +235,7 @@ const AddBucket = ({
209235
addBucketQuota(event.target.checked);
210236
}}
211237
label={"Enable Bucket Quota"}
238+
indicatorLabel={"On"}
212239
/>
213240
</Grid>
214241
{enableQuota && (
@@ -264,11 +291,19 @@ const AddBucket = ({
264291
)}
265292
</Grid>
266293
<Grid item xs={12} className={classes.buttonContainer}>
294+
<button
295+
type="button"
296+
color="primary"
297+
className={classes.clearButton}
298+
onClick={resetForm}
299+
>
300+
Clear
301+
</button>
267302
<Button
268303
type="submit"
269304
variant="contained"
270305
color="primary"
271-
disabled={addLoading}
306+
disabled={addLoading || !sendEnabled}
272307
>
273308
Save
274309
</Button>

0 commit comments

Comments
 (0)