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

bump to v3.16.7 #2586

Merged
merged 2 commits into from
Mar 5, 2025
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on
[Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [v3.16.7] - 2025-03-04
Released with [maproulette-backend_v4.7.3](https://github.com/maproulette/maproulette-backend/releases/tag/v4.7.3)

## What's Changed
* fix autosuggest bug by @jschwarz2030 in https://github.com/maproulette/maproulette3/pull/2585

**Full Changelog**: https://github.com/maproulette/maproulette3/compare/v3.16.6...v3.16.7

## [v3.16.6] - 2025-03-03
Released with [maproulette-backend_v4.7.3](https://github.com/maproulette/maproulette-backend/releases/tag/v4.7.3)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "maproulette3",
"version": "3.16.6",
"version": "3.16.7",
"type": "module",
"private": true,
"scripts": {
Expand Down
32 changes: 2 additions & 30 deletions src/components/Widgets/NearbyTasksWidget/NearbyTasksWidget.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ import bbox from "@turf/bbox";
import { featureCollection, point } from "@turf/helpers";
import _isEqual from "lodash/isEqual";
import _map from "lodash/map";
import _pick from "lodash/pick";
import _sum from "lodash/sum";
import _values from "lodash/values";
import { Component } from "react";
import { FormattedMessage } from "react-intl";
import { Popup } from "react-leaflet";
import AsMappableTask from "../../../interactions/Task/AsMappableTask";
import { toLatLngBounds } from "../../../services/MapBounds/MapBounds";
import { buildSearchURL } from "../../../services/SearchCriteria/SearchCriteria";
import { TaskAction } from "../../../services/Task/TaskAction/TaskAction";
import { WidgetDataTarget, registerWidgetType } from "../../../services/Widget/Widget";
import BusySpinner from "../../BusySpinner/BusySpinner";
import Dropdown from "../../Dropdown/Dropdown";
Expand All @@ -38,8 +34,6 @@ import TaskStatusFilter from "../../TaskFilters/TaskStatusFilter";
import messages from "./Messages";
import TaskMarkerContent from "./TaskMarkerContent";

const VALID_STATUS_KEYS = [TaskAction.available, TaskAction.skipped, TaskAction.tooHard];

const descriptor = {
widgetKey: "NearbyTasksWidget",
label: messages.label,
Expand Down Expand Up @@ -221,21 +215,8 @@ export default class NearbyTasksWidget extends Component {
}
}

const calculateTasksInChallenge = (props) => {
const actions = props.browsedChallenge?.actions;
if (!actions) {
return props.taskInfo?.totalCount || props.taskInfo?.tasks?.length;
}

return _sum(_values(_pick(actions, VALID_STATUS_KEYS)));
};

const ActiveBundle = (props) => {
const { task, taskBundle, bundleEditsDisabled, initialBundle, widgetLayout } = props;
const disabled =
props.bundleEditsDisabled ||
(props.initialBundle &&
props.initialBundle?.taskIds?.sort() === props.taskBundle?.taskIds?.sort());
const { task, taskBundle, widgetLayout } = props;

const showMarkerPopup = (markerData) => {
return (
Expand Down Expand Up @@ -369,14 +350,7 @@ const ActiveBundle = (props) => {
};

const BuildBundle = (props) => {
const {
virtualChallenge,
virtualChallengeId,
taskInfo,
taskReadOnly,
selectedTasks,
bundleEditsDisabled,
} = props;
const { virtualChallenge, virtualChallengeId } = props;

if (virtualChallenge || Number.isFinite(virtualChallengeId)) {
return (
Expand All @@ -386,8 +360,6 @@ const BuildBundle = (props) => {
);
}

const totalTaskCount = taskInfo?.totalCount || taskInfo?.tasks?.length;

const showMarkerPopup = (markerData) => {
return (
<Popup
Expand Down