Merge branch 'fixes' into 'dev'

fixes

See merge request spatial/postamates_frontend!75
dev
Anton Vlasov 2 years ago
commit af0c932252

@ -30,7 +30,7 @@ export function LastMLRun() {
Последнее обновление системы
</div>
<div className="text-xs text-grey z-10 bg-white-background rounded-xl px-2 py-0.5 space-y-3">
{new Date(data?.last_time).toLocaleString('ru-RU')}
{data?.last_time && new Date(data?.last_time).toLocaleString('ru-RU')}
</div>
<Button type="text" className="flex items-center p-2 text-[#C50000] hover:text-[#C50000] text-xs" onClick={() => startUpdating()}>
Обновить систему

@ -83,15 +83,15 @@ const MultipleFeaturesPopup = ({ features, points }) => {
{feature.properties.category === CATEGORIES.residential || feature.layer.id === LAYER_IDS.working ? (
<div className="space-x-2 flex items-center w-full">
<span className="flex-1 truncate inline-block">
{point.address}
{point?.address}
</span>
<span>{point.name}</span>
<span>{point?.name}</span>
</div>
) : (
<div className="flex w-full">
<span className="truncate">
{point.name ?? point.category}
{point.category_id && getRivalsName(feature).name}
{point?.name ?? point?.category}
{point?.category_id && getRivalsName(feature).name}
</span>
</div>
)}

@ -28,7 +28,7 @@ export const PendingPointsFilters = () => {
const newRanges = data?.fullRange;
if (!newRanges) return;
RANGE_FILTERS_KEYS.map((key) => {
if (!ranges[key]) {
if (!ranges[key] && !!newRanges[key]) {
setFilterWithKey(newRanges[key], key);
return;
}

Loading…
Cancel
Save