diff --git a/src/components/CreateTeam/UpdateTeamResourceModal.tsx b/src/components/CreateTeam/UpdateTeamResourceModal.tsx index 137c53fb9..40fdcd0bf 100644 --- a/src/components/CreateTeam/UpdateTeamResourceModal.tsx +++ b/src/components/CreateTeam/UpdateTeamResourceModal.tsx @@ -8,6 +8,8 @@ import { useOutsideClick } from '../../hooks/use-outside-click'; import { useKeydown } from '../../hooks/use-keydown'; import type { TeamResourceConfig } from './RoadmapSelector'; import { useToast } from '../../hooks/use-toast'; +import { useStore } from '@nanostores/preact'; +import { $currentTeam } from '../../stores/team'; export type ProgressMapProps = { teamId: string; @@ -38,6 +40,8 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) { const [removedItems, setRemovedItems] = useState(defaultRemovedItems); + const currentTeam = useStore($currentTeam); + useEffect(() => { function onTopicClick(e: any) { const groupEl = e.target.closest('.clickable-group'); @@ -147,6 +151,11 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
-
+
{isLoading && (
diff --git a/src/components/FrameRenderer/FrameRenderer.css b/src/components/FrameRenderer/FrameRenderer.css index 1faf9d7ec..cd9791183 100644 --- a/src/components/FrameRenderer/FrameRenderer.css +++ b/src/components/FrameRenderer/FrameRenderer.css @@ -126,12 +126,12 @@ svg .removed path { } } -/*#resource-svg-wrap g:not([class]),*/ -/*#resource-svg-wrap circle,*/ -/*#resource-svg-wrap path[stroke='#fff'],*/ -/*#resource-svg-wrap g[data-group-id$="-note"]{*/ -/* display: none;*/ -/*}*/ +#customized-roadmap #resource-svg-wrap g:not([class]), +#customized-roadmap #resource-svg-wrap circle, +#customized-roadmap #resource-svg-wrap path[stroke='#fff'], +#customized-roadmap #resource-svg-wrap g[data-group-id$="-note"]{ + display: none; +} /*.clickable-group:hover {*/ /* cursor: url(/images/cursors/add.svg) 5 5, move;*/ diff --git a/src/components/TeamDropdown/TeamDropdown.tsx b/src/components/TeamDropdown/TeamDropdown.tsx index dce18d218..4038da0d4 100644 --- a/src/components/TeamDropdown/TeamDropdown.tsx +++ b/src/components/TeamDropdown/TeamDropdown.tsx @@ -9,6 +9,7 @@ import { $currentTeam, $teamList } from '../../stores/team'; import { useStore } from '@nanostores/preact'; import { useTeamId } from '../../hooks/use-team-id'; import { useToast } from '../../hooks/use-toast'; +import type {ValidTeamType} from "../CreateTeam/Step0"; const allowedStatus = ['invited', 'joined', 'rejected'] as const; export type AllowedMemberStatus = (typeof allowedStatus)[number]; @@ -18,6 +19,7 @@ export type UserTeamItem = { name: string; avatar?: string; roadmaps: string[]; + type: ValidTeamType; role: AllowedRoles; status: AllowedMemberStatus; memberId: string; diff --git a/src/components/TeamProgress/MemberProgressModal.tsx b/src/components/TeamProgress/MemberProgressModal.tsx index 23fb4f0ed..0ff503c28 100644 --- a/src/components/TeamProgress/MemberProgressModal.tsx +++ b/src/components/TeamProgress/MemberProgressModal.tsx @@ -16,6 +16,8 @@ import CloseIcon from '../../icons/close.svg'; import { useToast } from '../../hooks/use-toast'; import { useAuth } from '../../hooks/use-auth'; import { pageProgressMessage } from '../../stores/page'; +import { useStore } from '@nanostores/preact'; +import { $currentTeam } from '../../stores/team'; export type ProgressMapProps = { member: TeamMember; @@ -44,6 +46,7 @@ export function MemberProgressModal(props: ProgressMapProps) { } = props; const user = useAuth(); const isCurrentUser = user?.email === member.email; + const currentTeam = useStore($currentTeam); const containerEl = useRef(null); const popupBodyEl = useRef(null); @@ -275,14 +278,17 @@ export function MemberProgressModal(props: ProgressMapProps) { return (
-
+