@@ -30,7 +32,7 @@ const TeamCard = ({ team }) => {
{
label: "Open in Connect",
action: () => {
- window.open(formatConnectProjectUrl(team.id));
+ console.log("Issue reported!");
},
},
{
@@ -48,7 +50,7 @@ const TeamCard = ({ team }) => {
{
label: "Report an Issue",
action: () => {
- window.open(formatReportIssueUrl(`TaaS Issue: ${team.name}`));
+ showReportPopup(team.name, team.id);
},
},
]}
diff --git a/src/routes/MyTeamsList/index.jsx b/src/routes/MyTeamsList/index.jsx
index cb35ab06..85da5b6f 100644
--- a/src/routes/MyTeamsList/index.jsx
+++ b/src/routes/MyTeamsList/index.jsx
@@ -18,6 +18,7 @@ import { useDebounce } from "react-use";
import { TEAMS_PER_PAGE } from "constants";
import "./styles.module.scss";
import { INPUT_DEBOUNCE_DELAY } from "constants/";
+import ReportPopup from "components/ReportPopup";
const MyTeamsList = () => {
let [myTeams, setMyTeams] = useState(null);
@@ -95,6 +96,7 @@ const MyTeamsList = () => {
)}
)}
+
);
};
diff --git a/src/routes/PositionDetails/components/PositionCandidates/index.jsx b/src/routes/PositionDetails/components/PositionCandidates/index.jsx
index c5558d91..44fc99e6 100644
--- a/src/routes/PositionDetails/components/PositionCandidates/index.jsx
+++ b/src/routes/PositionDetails/components/PositionCandidates/index.jsx
@@ -61,7 +61,7 @@ const PositionCandidates = ({ position, candidateStatus, updateCandidate }) => {
useEffect(() => {
setPage(1);
- }, [candidateStatus])
+ }, [candidateStatus]);
const filteredCandidates = useMemo(
() =>
diff --git a/src/routes/TeamAccess/actions/index.js b/src/routes/TeamAccess/actions/index.js
index 6eb0a3c1..43e374b7 100644
--- a/src/routes/TeamAccess/actions/index.js
+++ b/src/routes/TeamAccess/actions/index.js
@@ -8,7 +8,7 @@ import {
deleteTeamMember,
deleteInvite,
getMemberSuggestions,
- postInvites
+ postInvites,
} from "services/teams";
export const ACTION_TYPE = {
@@ -37,7 +37,7 @@ export const ACTION_TYPE = {
ADD_INVITES_SUCCESS: "ADD_INVITES_SUCCESS",
ADD_INVITES_ERROR: "ADD_INVITES_ERROR",
CLEAR_ALL: "CLEAR_ALL",
- CLEAR_SUGGESTIONS: "CLEAR_SUGGESTIONS"
+ CLEAR_SUGGESTIONS: "CLEAR_SUGGESTIONS",
};
/**
@@ -108,7 +108,7 @@ export const removeTeamMember = (teamId, memberId) => ({
*
* @param {string|number} teamId
* @param {string|number} REMOVE_INVITE_PENDING
- *
+ *
* @returns {Promise} deleted invite id or error
*/
export const removeInvite = (teamId, inviteId) => ({
@@ -125,36 +125,36 @@ export const removeInvite = (teamId, inviteId) => ({
/**
* Loads suggestions for invites
- *
+ *
* @param {string} fragment
- *
- * @returns {Promise
} list of suggestions or error
+ *
+ * @returns {Promise} list of suggestions or error
*/
-export const loadSuggestions = fragment => ({
+export const loadSuggestions = (fragment) => ({
type: ACTION_TYPE.LOAD_SUGGESTIONS,
payload: async () => {
const res = await getMemberSuggestions(fragment);
return res.data.result.content;
},
meta: {
- fragment
- }
-})
+ fragment,
+ },
+});
/**
* Clears invite suggestions
*/
export const clearSuggestions = () => ({
- type: ACTION_TYPE.CLEAR_SUGGESTIONS
-})
+ type: ACTION_TYPE.CLEAR_SUGGESTIONS,
+});
/**
* Adds invites to team
- *
+ *
* @param {string|number} teamId
* @param {string[]} handles
* @param {string[]} emails
- *
+ *
* @returns {Promise} list of successes and failures, or error
*/
export const addInvites = (teamId, handles, emails) => ({
@@ -162,5 +162,5 @@ export const addInvites = (teamId, handles, emails) => ({
payload: async () => {
const res = await postInvites(teamId, handles, emails, "customer");
return res.data;
- }
-})
\ No newline at end of file
+ },
+});
diff --git a/src/routes/TeamAccess/components/AddModal/index.jsx b/src/routes/TeamAccess/components/AddModal/index.jsx
index b0f111aa..c046f7d2 100644
--- a/src/routes/TeamAccess/components/AddModal/index.jsx
+++ b/src/routes/TeamAccess/components/AddModal/index.jsx
@@ -1,5 +1,5 @@
import React, { useCallback, useState } from "react";
-import _ from 'lodash';
+import _ from "lodash";
import { useDispatch, useSelector } from "react-redux";
import { toastr } from "react-redux-toastr";
import { loadSuggestions, clearSuggestions, addInvites } from "../../actions";
@@ -9,88 +9,109 @@ import ReactSelect from "components/ReactSelect";
const SUGGESTION_TRIGGER_LENGTH = 3;
-function AddModal({ open, onClose, teamId, validateInvites}) {
-
+function AddModal({ open, onClose, teamId, validateInvites }) {
const [loading, setLoading] = useState(false);
const [error, setError] = useState();
const [selectedMembers, setSelectedMembers] = useState([]);
- const options = useSelector(state => state.teamMembers.suggestions.map(sugg => ({ label: sugg.handle, value: sugg.handle })));
+ const options = useSelector((state) =>
+ state.teamMembers.suggestions.map((sugg) => ({
+ label: sugg.handle,
+ value: sugg.handle,
+ }))
+ );
const dispatch = useDispatch();
- const debouncedLoadSuggestions = _.debounce(arg => {dispatch(loadSuggestions(arg))}, 500, {leading: true});
+ const debouncedLoadSuggestions = _.debounce(
+ (arg) => {
+ dispatch(loadSuggestions(arg));
+ },
+ 500,
+ { leading: true }
+ );
const validateSelection = () => {
if (validateInvites(selectedMembers)) {
- setError(new Error("Project members can't be invited again. Please remove them from list"));
+ setError(
+ new Error(
+ "Project members can't be invited again. Please remove them from list"
+ )
+ );
} else {
setError(undefined);
}
- }
+ };
const handleClose = useCallback(() => {
setSelectedMembers([]);
- onClose()
- },[onClose])
+ onClose();
+ }, [onClose]);
const submitInvites = useCallback(() => {
const handles = [];
const emails = [];
- selectedMembers.forEach(member => {
+ selectedMembers.forEach((member) => {
const val = member.label;
if (member.isEmail) {
emails.push(val);
} else {
handles.push(val);
}
- })
+ });
setLoading(true);
- dispatch(addInvites(teamId, handles, emails))
- .then((res) => {
- setLoading(false);
- if (!res.value.failed) {
- const numInvites = res.value.success.length;
- const plural = numInvites !== 1 ? "s": "";
- handleClose()
- toastr.success("Invites Added", `Successfully added ${numInvites} invite${plural}`)
- }
- })
-
- }, [dispatch, selectedMembers, teamId])
-
- const onInputChange = useCallback((val) => {
- const spaceIndex = val.indexOf(" ");
- const semiColonIndex = val.indexOf(";");
-
- // use space or semi-colon to add a member
- if (spaceIndex === 0 || semiColonIndex === 0) return "";
- if (spaceIndex >= 1 || semiColonIndex >= 1) {
- val = val.slice(0, -1);
- onUpdate([...selectedMembers, {label: val, value: val}])
- return "";
- }
+ dispatch(addInvites(teamId, handles, emails)).then((res) => {
+ setLoading(false);
+ if (!res.value.failed) {
+ const numInvites = res.value.success.length;
+ const plural = numInvites !== 1 ? "s" : "";
+ handleClose();
+ toastr.success(
+ "Invites Added",
+ `Successfully added ${numInvites} invite${plural}`
+ );
+ }
+ });
+ }, [dispatch, selectedMembers, teamId]);
+
+ const onInputChange = useCallback(
+ (val) => {
+ const spaceIndex = val.indexOf(" ");
+ const semiColonIndex = val.indexOf(";");
+
+ // use space or semi-colon to add a member
+ if (spaceIndex === 0 || semiColonIndex === 0) return "";
+ if (spaceIndex >= 1 || semiColonIndex >= 1) {
+ val = val.slice(0, -1);
+ onUpdate([...selectedMembers, { label: val, value: val }]);
+ return "";
+ }
- // load suggestions
- if (val.length >= SUGGESTION_TRIGGER_LENGTH) {
- debouncedLoadSuggestions(val);
- } else {
- dispatch(clearSuggestions());
- }
- }, [dispatch])
+ // load suggestions
+ if (val.length >= SUGGESTION_TRIGGER_LENGTH) {
+ debouncedLoadSuggestions(val);
+ } else {
+ dispatch(clearSuggestions());
+ }
+ },
+ [dispatch]
+ );
- const onUpdate = useCallback((arr) => {
- const normalizedArr = arr.map(member => ({
- ...member,
- isEmail: (/(.+)@(.+){2,}\.(.+){2,}/).test(member.label)
- }));
+ const onUpdate = useCallback(
+ (arr) => {
+ const normalizedArr = arr.map((member) => ({
+ ...member,
+ isEmail: /(.+)@(.+){2,}\.(.+){2,}/.test(member.label),
+ }));
- setSelectedMembers(normalizedArr);
-
- validateSelection()
+ setSelectedMembers(normalizedArr);
- dispatch(clearSuggestions());
- }, [dispatch])
+ validateSelection();
+
+ dispatch(clearSuggestions());
+ },
+ [dispatch]
+ );
const inviteButton = (