Skip to content

Commit 4cc64cb

Browse files
avrhamNeemanavrhamNeeman
authored
Merge pull request #657 from memphisdev/ui_enhancement
fix isuue
2 parents 6269e09 + 1a1fbe0 commit 4cc64cb

File tree

11 files changed

+56
-50
lines changed

11 files changed

+56
-50
lines changed

‎ui_src/src/components/button/style.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515

1616
.noHover {
1717
pointer-events: none;
18+
display: block !important;
1819
}

‎ui_src/src/components/createStationForm/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ const CreateStationForm = ({ createStationFormRef, getStartedStateRef, finishUpd
346346
<Switcher onChange={() => setUseSchema(!useSchema)} checked={useSchema} />
347347
</div>
348348
{!getStarted && useSchema && (
349-
<Form.Item name="schemaValue" initialValue={schemas.length > 0 ? schemas[0].name : null}>
349+
<Form.Item name="schemaValue" initialValue={schemas?.length > 0 ? schemas[0]?.name : null}>
350350
<SelectSchema
351351
placeholder={creationForm.schemaValue || 'Select schema'}
352352
value={creationForm.schemaValue || schemas[0]}

‎ui_src/src/components/filter/customCollapse.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ const CustomCollapse = ({ cancel, apply, clear }) => {
9494
case filterType.DATE:
9595
return filterGroup.fields.map((filterField, filterFieldIndex = 0) => {
9696
return (
97-
<div className="date-container" key={filterField.name}>
98-
<label>{filterField.label}</label>
97+
<div className="date-container" key={filterField?.name}>
98+
<label>{filterField?.label}</label>
9999
<DatePicker
100100
type="text"
101101
radiusType="semi-round"
@@ -116,7 +116,7 @@ const CustomCollapse = ({ cancel, apply, clear }) => {
116116
height="25px"
117117
fontFamily="InterSemiBold"
118118
options={filterGroup.fields.map((item, id) => {
119-
return { id: id, value: id, label: item.name };
119+
return { id: id, value: id, label: item?.name };
120120
})}
121121
radioStyle="radiobtn-capitalize"
122122
radioValue={filterGroup.radioValue}
@@ -132,13 +132,13 @@ const CustomCollapse = ({ cancel, apply, clear }) => {
132132
return filterGroup?.fields?.map((filterField, filterFieldIndex = 0) => {
133133
if (filterFieldIndex < 3)
134134
return (
135-
<div className="label-container" key={filterField.name}>
135+
<div className="label-container" key={filterField?.name}>
136136
<Checkbox
137137
checked={filterField?.checked || false}
138138
onChange={() => updateChoice(filterGroupIndex, filterFieldIndex)}
139-
name={filterGroup.name}
139+
name={filterGroup?.name}
140140
/>
141-
<Tag tag={{ color: filterField.color, name: filterField.name }}></Tag>
141+
<Tag tag={{ color: filterField.color, name: filterField?.name }}></Tag>
142142
</div>
143143
);
144144
else {
@@ -148,9 +148,9 @@ const CustomCollapse = ({ cancel, apply, clear }) => {
148148
<Checkbox
149149
checked={filterField?.checked || false}
150150
onChange={() => updateChoice(filterGroupIndex, filterFieldIndex)}
151-
name={filterGroup.name}
151+
name={filterGroup?.name}
152152
/>
153-
<Tag tag={{ color: filterField.color, name: filterField.name }}></Tag>
153+
<Tag tag={{ color: filterField.color, name: filterField?.name }}></Tag>
154154
</div>
155155
{filterFieldIndex === filterGroup.fields.length - 1 && (
156156
<p className="show-more" onClick={() => showMoreLess(filterGroupIndex, false)}>
@@ -170,21 +170,25 @@ const CustomCollapse = ({ cancel, apply, clear }) => {
170170
case labelType.CIRCLEDLETTER:
171171
return filterGroup?.fields?.map((filterField, filterFieldIndex = 0) => {
172172
return (
173-
<div className="circle-container" key={filterField.name}>
174-
<Checkbox checked={filterField?.checked || false} onChange={() => updateChoice(filterGroupIndex, filterFieldIndex)} name={filterGroup.name} />
173+
<div className="circle-container" key={filterField?.name}>
174+
<Checkbox
175+
checked={filterField?.checked || false}
176+
onChange={() => updateChoice(filterGroupIndex, filterFieldIndex)}
177+
name={filterGroup?.name}
178+
/>
175179
<p className="circle-letter" style={{ backgroundColor: filterField.color }}>
176-
{filterField.name[0]?.toUpperCase()}
180+
{filterField?.name[0]?.toUpperCase()}
177181
</p>
178-
<label>{filterField.name}</label>
182+
<label>{filterField?.name}</label>
179183
</div>
180184
);
181185
});
182186
default:
183187
return filterGroup.fields.map((filterField, filterFieldIndex = 0) => {
184188
return (
185-
<div className="default-checkbox" key={filterField.name}>
186-
<Checkbox checked={filterField.checked} onChange={() => updateChoice(filterGroupIndex, filterFieldIndex)} name={filterGroup.name} />
187-
<label>{filterField.name}</label>
189+
<div className="default-checkbox" key={filterField?.name}>
190+
<Checkbox checked={filterField.checked} onChange={() => updateChoice(filterGroupIndex, filterFieldIndex)} name={filterGroup?.name} />
191+
<label>{filterField?.name}</label>
188192
</div>
189193
);
190194
});

‎ui_src/src/components/filter/index.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -271,50 +271,50 @@ const Filter = ({ filterComponent, height, applyFilter }) => {
271271
let data = state?.domainList;
272272
switch (filterComponent) {
273273
case 'stations':
274-
if (filterTerms?.find((o) => o.name === 'tags')) {
275-
objTags = filterTerms?.find((o) => o.name === 'tags')?.fields?.map((element) => element?.toLowerCase());
274+
if (filterTerms?.find((o) => o?.name === 'tags')) {
275+
objTags = filterTerms?.find((o) => o?.name === 'tags')?.fields?.map((element) => element?.toLowerCase());
276276
data = data?.filter((item) =>
277-
objTags?.length > 0 ? item.tags.some((tag) => objTags?.includes(tag.name)) : !item.tags.some((tag) => objTags?.includes(tag.name))
277+
objTags?.length > 0 ? item.tags.some((tag) => objTags?.includes(tag?.name)) : !item.tags.some((tag) => objTags?.includes(tag?.name))
278278
);
279279
}
280-
if (filterTerms?.find((o) => o.name === 'created')) {
281-
objCreated = filterTerms?.find((o) => o.name === 'created')?.fields?.map((element) => element?.toLowerCase());
280+
if (filterTerms?.find((o) => o?.name === 'created')) {
281+
objCreated = filterTerms?.find((o) => o?.name === 'created')?.fields?.map((element) => element?.toLowerCase());
282282
data = data?.filter((item) =>
283283
objCreated?.length > 0 ? objCreated?.includes(item.station.created_by_user) : !objCreated?.includes(item.station.created_by_user)
284284
);
285285
}
286-
if (filterTerms?.find((o) => o.name === 'storage')) {
287-
objStorage = filterTerms?.find((o) => o.name === 'storage')?.fields?.map((element) => element?.toLowerCase());
286+
if (filterTerms?.find((o) => o?.name === 'storage')) {
287+
objStorage = filterTerms?.find((o) => o?.name === 'storage')?.fields?.map((element) => element?.toLowerCase());
288288
data = data.filter((item) =>
289289
objStorage?.length > 0 ? objStorage?.includes(item.station.storage_type) : !objStorage?.includes(item.station.storage_type)
290290
);
291291
}
292292
if (searchInput !== '' && searchInput?.length >= 2) {
293-
data = data.filter((station) => station.station.name.includes(searchInput));
293+
data = data.filter((station) => station.station?.name.includes(searchInput));
294294
}
295295
dispatch({ type: 'SET_FILTERED_LIST', payload: data });
296296
return;
297297
case 'schemaverse':
298-
if (filterTerms?.find((o) => o.name === 'tags')) {
299-
objTags = filterTerms?.find((o) => o.name === 'tags')?.fields?.map((element) => element?.toLowerCase());
298+
if (filterTerms?.find((o) => o?.name === 'tags')) {
299+
objTags = filterTerms?.find((o) => o?.name === 'tags')?.fields?.map((element) => element?.toLowerCase());
300300
data = data?.filter((item) =>
301-
objTags?.length > 0 ? item.tags.some((tag) => objTags?.includes(tag.name)) : !item.tags.some((tag) => objTags?.includes(tag.name))
301+
objTags?.length > 0 ? item.tags.some((tag) => objTags?.includes(tag?.name)) : !item.tags.some((tag) => objTags?.includes(tag?.name))
302302
);
303303
}
304-
if (filterTerms?.find((o) => o.name === 'created')) {
305-
objCreated = filterTerms?.find((o) => o.name === 'created')?.fields?.map((element) => element?.toLowerCase());
304+
if (filterTerms?.find((o) => o?.name === 'created')) {
305+
objCreated = filterTerms?.find((o) => o?.name === 'created')?.fields?.map((element) => element?.toLowerCase());
306306
data = data?.filter((item) => (objCreated?.length > 0 ? objCreated?.includes(item.created_by_user) : !objCreated?.includes(item.created_by_user)));
307307
}
308-
if (filterTerms?.find((o) => o.name === 'type')) {
309-
objType = filterTerms?.find((o) => o.name === 'type')?.fields[0];
308+
if (filterTerms?.find((o) => o?.name === 'type')) {
309+
objType = filterTerms?.find((o) => o?.name === 'type')?.fields[0];
310310
data = data?.filter((item) => objType !== '' && item.type === objType);
311311
}
312-
if (filterTerms?.find((o) => o.name === 'usage')) {
313-
objUsage = filterTerms?.find((o) => o.name === 'usage')?.fields[0] === 'used';
312+
if (filterTerms?.find((o) => o?.name === 'usage')) {
313+
objUsage = filterTerms?.find((o) => o?.name === 'usage')?.fields[0] === 'used';
314314
data = data.filter((item) => item.used === objUsage);
315315
}
316316
if (searchInput !== '' && searchInput?.length >= 2) {
317-
data = data.filter((schema) => schema.name.includes(searchInput));
317+
data = data.filter((schema) => schema?.name.includes(searchInput));
318318
}
319319
dispatch({ type: 'SET_FILTERED_LIST', payload: data });
320320
return;
@@ -335,27 +335,27 @@ const Filter = ({ filterComponent, height, applyFilter }) => {
335335
let filterTerms = [];
336336
filterState?.filterFields.forEach((element) => {
337337
let term = {
338-
name: element.name,
338+
name: element?.name,
339339
fields: []
340340
};
341341
if (element.filterType === filterType.CHECKBOX) {
342342
element.fields.forEach((field) => {
343343
if (field.checked) {
344344
let t = term.fields;
345-
t.push(field.name);
345+
t.push(field?.name);
346346
term.fields = t;
347347
}
348348
});
349349
} else if (element.filterType === filterType.RADIOBUTTON && element.radioValue !== -1) {
350350
let t = [];
351-
t.push(element.fields[element.radioValue].name);
351+
t.push(element.fields[element.radioValue]?.name);
352352
term.fields = t;
353353
} else {
354354
element.fields.forEach((field) => {
355355
if (field?.value !== undefined && field?.value !== '') {
356356
let t = term.fields;
357357
let d = {};
358-
d[field.name] = field.value;
358+
d[field?.name] = field.value;
359359
t.push(d);
360360
term.fields = t;
361361
}

‎ui_src/src/domain/schema/components/attachStationModal/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ function AttachStationModal({ close, handleAttachedStations, attachedStations, s
6868
const getAllStations = async () => {
6969
try {
7070
const res = await httpRequest('GET', `${ApiEndpoints.GET_ALL_STATIONS}`);
71-
setAllStations(res);
71+
let native_staion = res.filter((station) => station.is_native);
72+
setAllStations(native_staion);
7273
} catch (err) {
7374
return;
7475
}

‎ui_src/src/domain/stationsList/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ const StationsList = () => {
8585
<div>
8686
{state.filteredList?.map((station) => (
8787
<StationBoxOverview
88-
key={station.station.id}
89-
isCheck={isCheck.includes(station.station.name)}
88+
key={station?.station?.id}
89+
isCheck={isCheck.includes(station?.station?.name)}
9090
handleCheckedClick={handleCheckedClick}
9191
station={station}
9292
/>
@@ -115,7 +115,7 @@ const StationsList = () => {
115115

116116
const onCheckedAll = (e) => {
117117
setIsCheckAll(!isCheckAll);
118-
setIsCheck(state.filteredList.map((li) => li.station.name));
118+
setIsCheck(state.filteredList.map((li) => li.station?.name));
119119
if (isCheckAll) {
120120
setIsCheck([]);
121121
}

‎ui_static_files/build/asset-manifest.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
3-
"main.css": "/static/css/main.04780146.css",
4-
"main.js": "/static/js/main.5dc780af.js",
3+
"main.css": "/static/css/main.731e44cd.css",
4+
"main.js": "/static/js/main.2250f7b9.js",
55
"static/js/617.a5f8c4fc.chunk.js": "/static/js/617.a5f8c4fc.chunk.js",
66
"static/js/2542.27de8743.chunk.js": "/static/js/2542.27de8743.chunk.js",
77
"static/js/1737.e134cfd4.chunk.js": "/static/js/1737.e134cfd4.chunk.js",
@@ -234,7 +234,7 @@
234234
"static/media/stationsIconActive.svg": "/static/media/stationsIconActive.e26419ca89a74315be8a7f6bf33756f3.svg"
235235
},
236236
"entrypoints": [
237-
"static/css/main.04780146.css",
238-
"static/js/main.5dc780af.js"
237+
"static/css/main.731e44cd.css",
238+
"static/js/main.2250f7b9.js"
239239
]
240240
}

‎ui_static_files/build/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/manifest.json"/><title>Memphis - Dashboard</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.5dc780af.js"></script><link href="/static/css/main.04780146.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/manifest.json"/><title>Memphis - Dashboard</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.2250f7b9.js"></script><link href="/static/css/main.731e44cd.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

‎ui_static_files/build/static/css/main.04780146.css‎ renamed to ‎ui_static_files/build/static/css/main.731e44cd.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ui_static_files/build/static/js/main.5dc780af.js‎ renamed to ‎ui_static_files/build/static/js/main.2250f7b9.js‎

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

0 commit comments

Comments
 (0)