Skip to content

Commit 0d10e6c

Browse files
CollinBeczakCollinBeczak
committed
run formatting
1 parent cab8221 commit 0d10e6c

File tree

16 files changed

+105
-121
lines changed

16 files changed

+105
-121
lines changed

‎src/components/HOCs/WithFilterCriteria/WithFilterCriteria.jsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export default function WithFilterCriteria(
114114
this.setState(
115115
(prevState) => {
116116
const criteria = _cloneDeep(prevState.criteria);
117-
117+
118118
if (newCriteria.sortCriteria !== undefined) {
119119
criteria.sortCriteria = newCriteria.sortCriteria;
120120
}
@@ -128,7 +128,7 @@ export default function WithFilterCriteria(
128128
// Merge new filter values while preserving existing filter keys
129129
// This ensures dropdown filters (status, priorities, reviewStatus) are preserved
130130
// when table column filters (id, featureId, etc.) are updated
131-
if (newCriteria.filters && typeof newCriteria.filters === 'object') {
131+
if (newCriteria.filters && typeof newCriteria.filters === "object") {
132132
criteria.filters = { ...criteria.filters, ...newCriteria.filters };
133133
}
134134

@@ -179,7 +179,7 @@ export default function WithFilterCriteria(
179179
const newCriteria = _cloneDeep(DEFAULT_CRITERIA);
180180
newCriteria.boundingBox = usePersistedFilters ? this.state.criteria.boundingBox : null;
181181
newCriteria.zoom = this.state.zoom;
182-
182+
183183
const includedFilters = buildIncludedFilters(this.props);
184184
newCriteria.filters = { ...newCriteria.filters, ...includedFilters };
185185

@@ -347,7 +347,7 @@ export default function WithFilterCriteria(
347347

348348
componentDidMount() {
349349
this.initialLoadTriggered = false;
350-
350+
351351
if (
352352
!ignoreURL &&
353353
(!_isEmpty(this.props.history.location.search) ||
@@ -391,7 +391,7 @@ export default function WithFilterCriteria(
391391
let typedCriteria = _cloneDeep(this.state.criteria);
392392

393393
// Check if filter props changed
394-
const filterPropsChanged =
394+
const filterPropsChanged =
395395
prevProps.includeTaskStatuses !== this.props.includeTaskStatuses ||
396396
prevProps.includeTaskReviewStatuses !== this.props.includeTaskReviewStatuses ||
397397
prevProps.includeMetaReviewStatuses !== this.props.includeMetaReviewStatuses ||

‎src/components/TaskAnalysisTable/TableSearchFilter.jsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ import { inputStyles } from "../TableShared/TableStyles";
1414
*/
1515
const TableSearchFilter = ({ filterValue, setFilter, placeholder, className = "" }) => {
1616
return (
17-
<div
18-
className={`mr-flex mr-items-center ${className}`}
19-
onClick={(e) => e.stopPropagation()}
20-
>
17+
<div className={`mr-flex mr-items-center ${className}`} onClick={(e) => e.stopPropagation()}>
2118
<SearchFilter
2219
value={filterValue}
2320
onChange={setFilter}
@@ -42,4 +39,3 @@ const TableSearchFilter = ({ filterValue, setFilter, placeholder, className = ""
4239
};
4340

4441
export default TableSearchFilter;
45-

‎src/components/TaskAnalysisTable/TaskAnalysisTable.jsx‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,17 @@ import {
1414
useTable,
1515
} from "react-table";
1616
import ConfigureColumnsModal from "../ConfigureColumnsModal/ConfigureColumnsModal";
17-
import WithTargetUser from "../HOCs/WithTargetUser/WithTargetUser";
1817
import WithConfigurableColumns from "../HOCs/WithConfigurableColumns/WithConfigurableColumns";
1918
import WithLoadedTask from "../HOCs/WithLoadedTask/WithLoadedTask";
19+
import WithTargetUser from "../HOCs/WithTargetUser/WithTargetUser";
2020
import PaginationControl from "../PaginationControl/PaginationControl";
21-
import {
22-
TableWrapper,
23-
renderTableCell,
24-
renderTableHeader,
25-
} from "../TableShared/EnhancedTable";
21+
import { TableWrapper, renderTableCell, renderTableHeader } from "../TableShared/EnhancedTable";
2622
import { rowStyles, tableStyles } from "../TableShared/TableStyles";
2723
import TaskCommentsModal from "../TaskCommentsModal/TaskCommentsModal";
2824
import ViewTask from "../ViewTask/ViewTask";
29-
import { ALL_COLUMNS, DEFAULT_COLUMNS, setupColumnTypes } from "./columns/index.jsx";
3025
import messages from "./Messages";
3126
import TaskAnalysisTableHeader from "./TaskAnalysisTableHeader";
27+
import { ALL_COLUMNS, DEFAULT_COLUMNS, setupColumnTypes } from "./columns/index.jsx";
3228

3329
// Setup child components with necessary HOCs
3430
const ViewTaskSubComponent = WithLoadedTask(ViewTask);

‎src/components/TaskAnalysisTable/columns/actionColumns.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { FormattedMessage } from "react-intl";
22
import { Link } from "react-router-dom";
33
import InTableTagFilter from "../../KeywordAutosuggestInput/InTableTagFilter";
44
import SvgSymbol from "../../SvgSymbol/SvgSymbol";
5+
import messages from "../Messages";
56
import { ViewCommentsButton } from "../TaskTableHelpers";
67
import { BUNDLEABLE_STATUSES } from "../utils/bundleHelpers";
7-
import messages from "../Messages";
88

99
/**
1010
* Creates the Edit Bundle column for managing task bundles
@@ -25,20 +25,24 @@ export const createEditBundleColumn = (props) => ({
2525

2626
return (
2727
<div>
28-
{!isActiveTask && validBundlingStatus && isInActiveBundle && !alreadyBundled && !isLocked && (
29-
<button
30-
disabled={bundleEditsDisabled}
31-
className="mr-text-red-light"
32-
style={{
33-
cursor: bundleEditsDisabled ? "default" : "pointer",
34-
opacity: bundleEditsDisabled ? 0.3 : 1,
35-
pointerEvents: bundleEditsDisabled ? "none" : "auto",
36-
}}
37-
onClick={() => props.unbundleTask(row.original)}
38-
>
39-
<FormattedMessage {...messages.unbundle} />
40-
</button>
41-
)}
28+
{!isActiveTask &&
29+
validBundlingStatus &&
30+
isInActiveBundle &&
31+
!alreadyBundled &&
32+
!isLocked && (
33+
<button
34+
disabled={bundleEditsDisabled}
35+
className="mr-text-red-light"
36+
style={{
37+
cursor: bundleEditsDisabled ? "default" : "pointer",
38+
opacity: bundleEditsDisabled ? 0.3 : 1,
39+
pointerEvents: bundleEditsDisabled ? "none" : "auto",
40+
}}
41+
onClick={() => props.unbundleTask(row.original)}
42+
>
43+
<FormattedMessage {...messages.unbundle} />
44+
</button>
45+
)}
4246

4347
{!isActiveTask &&
4448
validBundlingStatus &&
@@ -140,10 +144,7 @@ export const createTagsColumn = (props) => ({
140144
<div className="row-challenge-column mr-text-white mr-whitespace-normal mr-flex mr-flex-wrap">
141145
{value?.map((t) =>
142146
t.name === "" ? null : (
143-
<div
144-
className="mr-inline mr-bg-white-10 mr-rounded mr-py-1 mr-px-2 mr-m-1"
145-
key={t.id}
146-
>
147+
<div className="mr-inline mr-bg-white-10 mr-rounded mr-py-1 mr-px-2 mr-m-1" key={t.id}>
147148
{t.name}
148149
</div>
149150
),
@@ -183,4 +184,3 @@ export const createTagsColumn = (props) => ({
183184
width: 120,
184185
minWidth: 120,
185186
});
186-

‎src/components/TaskAnalysisTable/columns/actionColumns.jsx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { FormattedMessage } from "react-intl";
22
import { Link } from "react-router-dom";
33
import InTableTagFilter from "../../KeywordAutosuggestInput/InTableTagFilter";
44
import SvgSymbol from "../../SvgSymbol/SvgSymbol";
5+
import messages from "../Messages";
56
import { ViewCommentsButton } from "../TaskTableHelpers";
67
import { BUNDLEABLE_STATUSES } from "../utils/bundleHelpers";
7-
import messages from "../Messages";
88

99
/**
1010
* Creates the Edit Bundle column for managing task bundles
@@ -25,20 +25,24 @@ export const createEditBundleColumn = (props) => ({
2525

2626
return (
2727
<div>
28-
{!isActiveTask && validBundlingStatus && isInActiveBundle && !alreadyBundled && !isLocked && (
29-
<button
30-
disabled={bundleEditsDisabled}
31-
className="mr-text-red-light"
32-
style={{
33-
cursor: bundleEditsDisabled ? "default" : "pointer",
34-
opacity: bundleEditsDisabled ? 0.3 : 1,
35-
pointerEvents: bundleEditsDisabled ? "none" : "auto",
36-
}}
37-
onClick={() => props.unbundleTask(row.original)}
38-
>
39-
<FormattedMessage {...messages.unbundle} />
40-
</button>
41-
)}
28+
{!isActiveTask &&
29+
validBundlingStatus &&
30+
isInActiveBundle &&
31+
!alreadyBundled &&
32+
!isLocked && (
33+
<button
34+
disabled={bundleEditsDisabled}
35+
className="mr-text-red-light"
36+
style={{
37+
cursor: bundleEditsDisabled ? "default" : "pointer",
38+
opacity: bundleEditsDisabled ? 0.3 : 1,
39+
pointerEvents: bundleEditsDisabled ? "none" : "auto",
40+
}}
41+
onClick={() => props.unbundleTask(row.original)}
42+
>
43+
<FormattedMessage {...messages.unbundle} />
44+
</button>
45+
)}
4246

4347
{!isActiveTask &&
4448
validBundlingStatus &&
@@ -140,10 +144,7 @@ export const createTagsColumn = (props) => ({
140144
<div className="row-challenge-column mr-text-white mr-whitespace-normal mr-flex mr-flex-wrap">
141145
{value?.map((t) =>
142146
t.name === "" ? null : (
143-
<div
144-
className="mr-inline mr-bg-white-10 mr-rounded mr-py-1 mr-px-2 mr-m-1"
145-
key={t.id}
146-
>
147+
<div className="mr-inline mr-bg-white-10 mr-rounded mr-py-1 mr-px-2 mr-m-1" key={t.id}>
147148
{t.name}
148149
</div>
149150
),
@@ -183,4 +184,3 @@ export const createTagsColumn = (props) => ({
183184
width: 120,
184185
minWidth: 120,
185186
});
186-

‎src/components/TaskAnalysisTable/columns/baseColumns.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import { BUNDLEABLE_STATUSES } from "../utils/bundleHelpers";
66
*/
77
export const createExpanderColumn = () => ({
88
id: "expander",
9-
Cell: ({ row }) => (
10-
<span {...row.getToggleRowExpandedProps()}>{row.isExpanded ? "▼" : "▶"}</span>
11-
),
9+
Cell: ({ row }) => <span {...row.getToggleRowExpandedProps()}>{row.isExpanded ? "▼" : "▶"}</span>,
1210
width: 40,
1311
disableSortBy: true,
1412
disableResizing: true,
@@ -60,4 +58,3 @@ export const createSelectedColumn = (props) => ({
6058
disableSortBy: true,
6159
disableResizing: true,
6260
});
63-

‎src/components/TaskAnalysisTable/columns/baseColumns.jsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import { BUNDLEABLE_STATUSES } from "../utils/bundleHelpers";
66
*/
77
export const createExpanderColumn = () => ({
88
id: "expander",
9-
Cell: ({ row }) => (
10-
<span {...row.getToggleRowExpandedProps()}>{row.isExpanded ? "▼" : "▶"}</span>
11-
),
9+
Cell: ({ row }) => <span {...row.getToggleRowExpandedProps()}>{row.isExpanded ? "▼" : "▶"}</span>,
1210
width: 40,
1311
disableSortBy: true,
1412
disableResizing: true,
@@ -60,4 +58,3 @@ export const createSelectedColumn = (props) => ({
6058
disableSortBy: true,
6159
disableResizing: true,
6260
});
63-

‎src/components/TaskAnalysisTable/columns/index.js‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
import AsManager from "../../../interactions/User/AsManager";
2-
import { createExpanderColumn, createSelectedColumn } from "./baseColumns";
3-
import { createControlsColumn, createCommentsColumn, createTagsColumn, createEditBundleColumn } from "./actionColumns";
42
import {
5-
createFeatureIdColumn,
6-
createIdColumn,
7-
createStatusColumn,
8-
createPriorityColumn,
9-
createMappedOnColumn,
10-
createCompletedDurationColumn,
11-
} from "./taskColumns";
3+
createCommentsColumn,
4+
createControlsColumn,
5+
createEditBundleColumn,
6+
createTagsColumn,
7+
} from "./actionColumns";
8+
import { createExpanderColumn, createSelectedColumn } from "./baseColumns";
129
import {
13-
createReviewRequestedByColumn,
14-
createReviewedAtColumn,
10+
createAdditionalReviewersColumn,
11+
createMetaReviewStatusColumn,
1512
createMetaReviewedAtColumn,
16-
createReviewDurationColumn,
17-
createReviewedByColumn,
1813
createMetaReviewedByColumn,
14+
createReviewDurationColumn,
15+
createReviewRequestedByColumn,
1916
createReviewStatusColumn,
20-
createMetaReviewStatusColumn,
21-
createAdditionalReviewersColumn,
17+
createReviewedAtColumn,
18+
createReviewedByColumn,
2219
} from "./reviewColumns";
20+
import {
21+
createCompletedDurationColumn,
22+
createFeatureIdColumn,
23+
createIdColumn,
24+
createMappedOnColumn,
25+
createPriorityColumn,
26+
createStatusColumn,
27+
} from "./taskColumns";
2328

2429
/**
2530
* All available column definitions
@@ -67,7 +72,7 @@ export const DEFAULT_COLUMNS = ["featureId", "id", "status", "priority", "contro
6772
*/
6873
export const setupColumnTypes = (props, taskBaseRoute, openComments) => {
6974
const manager = AsManager(props.user);
70-
75+
7176
const columns = {
7277
// Base columns
7378
expander: createExpanderColumn(),
@@ -128,4 +133,3 @@ export {
128133
createCommentsColumn,
129134
createTagsColumn,
130135
};
131-

‎src/components/TaskAnalysisTable/columns/index.jsx‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
import AsManager from "../../../interactions/User/AsManager";
2-
import { createExpanderColumn, createSelectedColumn } from "./baseColumns.jsx";
3-
import { createControlsColumn, createCommentsColumn, createTagsColumn, createEditBundleColumn } from "./actionColumns.jsx";
42
import {
5-
createFeatureIdColumn,
6-
createIdColumn,
7-
createStatusColumn,
8-
createPriorityColumn,
9-
createMappedOnColumn,
10-
createCompletedDurationColumn,
11-
} from "./taskColumns.jsx";
3+
createCommentsColumn,
4+
createControlsColumn,
5+
createEditBundleColumn,
6+
createTagsColumn,
7+
} from "./actionColumns.jsx";
8+
import { createExpanderColumn, createSelectedColumn } from "./baseColumns.jsx";
129
import {
13-
createReviewRequestedByColumn,
14-
createReviewedAtColumn,
10+
createAdditionalReviewersColumn,
11+
createMetaReviewStatusColumn,
1512
createMetaReviewedAtColumn,
16-
createReviewDurationColumn,
17-
createReviewedByColumn,
1813
createMetaReviewedByColumn,
14+
createReviewDurationColumn,
15+
createReviewRequestedByColumn,
1916
createReviewStatusColumn,
20-
createMetaReviewStatusColumn,
21-
createAdditionalReviewersColumn,
17+
createReviewedAtColumn,
18+
createReviewedByColumn,
2219
} from "./reviewColumns.jsx";
20+
import {
21+
createCompletedDurationColumn,
22+
createFeatureIdColumn,
23+
createIdColumn,
24+
createMappedOnColumn,
25+
createPriorityColumn,
26+
createStatusColumn,
27+
} from "./taskColumns.jsx";
2328

2429
/**
2530
* All available column definitions
@@ -67,7 +72,7 @@ export const DEFAULT_COLUMNS = ["featureId", "id", "status", "priority", "contro
6772
*/
6873
export const setupColumnTypes = (props, taskBaseRoute, openComments) => {
6974
const manager = AsManager(props.user);
70-
75+
7176
const columns = {
7277
// Base columns
7378
expander: createExpanderColumn(),
@@ -128,4 +133,3 @@ export {
128133
createCommentsColumn,
129134
createTagsColumn,
130135
};
131-

‎src/components/TaskAnalysisTable/columns/reviewColumns.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {
77
keysByReviewStatus,
88
messagesByReviewStatus,
99
} from "../../../services/Task/TaskReview/TaskReviewStatus";
10+
import messages from "../Messages";
1011
import TableSearchFilter from "../TableSearchFilter";
1112
import { StatusLabel, makeInvertable } from "../TaskTableHelpers";
12-
import messages from "../Messages";
1313

1414
/**
1515
* Creates the Review Requested By (Mapper) column
@@ -239,4 +239,3 @@ export const createAdditionalReviewersColumn = (props) => ({
239239
),
240240
width: 180,
241241
});
242-

0 commit comments

Comments
 (0)