Hide recommendations and reference from roadmaps for teams

pull/4269/head
Kamran Ahmed 1 year ago
parent 21008de3d1
commit 543d3b47ce
  1. 11
      src/components/CreateTeam/UpdateTeamResourceModal.tsx
  2. 12
      src/components/FrameRenderer/FrameRenderer.css
  3. 2
      src/components/TeamDropdown/TeamDropdown.tsx
  4. 24
      src/components/TeamProgress/MemberProgressModal.tsx

@ -8,6 +8,8 @@ import { useOutsideClick } from '../../hooks/use-outside-click';
import { useKeydown } from '../../hooks/use-keydown'; import { useKeydown } from '../../hooks/use-keydown';
import type { TeamResourceConfig } from './RoadmapSelector'; import type { TeamResourceConfig } from './RoadmapSelector';
import { useToast } from '../../hooks/use-toast'; import { useToast } from '../../hooks/use-toast';
import { useStore } from '@nanostores/preact';
import { $currentTeam } from '../../stores/team';
export type ProgressMapProps = { export type ProgressMapProps = {
teamId: string; teamId: string;
@ -38,6 +40,8 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
const [removedItems, setRemovedItems] = const [removedItems, setRemovedItems] =
useState<string[]>(defaultRemovedItems); useState<string[]>(defaultRemovedItems);
const currentTeam = useStore($currentTeam);
useEffect(() => { useEffect(() => {
function onTopicClick(e: any) { function onTopicClick(e: any) {
const groupEl = e.target.closest('.clickable-group'); const groupEl = e.target.closest('.clickable-group');
@ -147,6 +151,11 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
<div class="fixed left-0 right-0 top-0 z-50 h-full items-center justify-center overflow-y-auto overflow-x-hidden overscroll-contain bg-black/50"> <div class="fixed left-0 right-0 top-0 z-50 h-full items-center justify-center overflow-y-auto overflow-x-hidden overscroll-contain bg-black/50">
<div class="relative mx-auto h-full w-full max-w-4xl p-4 md:h-auto"> <div class="relative mx-auto h-full w-full max-w-4xl p-4 md:h-auto">
<div <div
id={
currentTeam?.type === 'company'
? 'customized-roadmap'
: 'original-roadmap'
}
ref={popupBodyEl} ref={popupBodyEl}
class="popup-body relative rounded-lg bg-white shadow" class="popup-body relative rounded-lg bg-white shadow"
> >
@ -189,7 +198,7 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
</button> </button>
</div> </div>
</div> </div>
<div ref={containerEl} className="px-4"></div> <div id="resource-svg-wrap" ref={containerEl} className="px-4"></div>
{isLoading && ( {isLoading && (
<div class="flex w-full justify-center"> <div class="flex w-full justify-center">

@ -126,12 +126,12 @@ svg .removed path {
} }
} }
/*#resource-svg-wrap g:not([class]),*/ #customized-roadmap #resource-svg-wrap g:not([class]),
/*#resource-svg-wrap circle,*/ #customized-roadmap #resource-svg-wrap circle,
/*#resource-svg-wrap path[stroke='#fff'],*/ #customized-roadmap #resource-svg-wrap path[stroke='#fff'],
/*#resource-svg-wrap g[data-group-id$="-note"]{*/ #customized-roadmap #resource-svg-wrap g[data-group-id$="-note"]{
/* display: none;*/ display: none;
/*}*/ }
/*.clickable-group:hover {*/ /*.clickable-group:hover {*/
/* cursor: url(/images/cursors/add.svg) 5 5, move;*/ /* cursor: url(/images/cursors/add.svg) 5 5, move;*/

@ -9,6 +9,7 @@ import { $currentTeam, $teamList } from '../../stores/team';
import { useStore } from '@nanostores/preact'; import { useStore } from '@nanostores/preact';
import { useTeamId } from '../../hooks/use-team-id'; import { useTeamId } from '../../hooks/use-team-id';
import { useToast } from '../../hooks/use-toast'; import { useToast } from '../../hooks/use-toast';
import type {ValidTeamType} from "../CreateTeam/Step0";
const allowedStatus = ['invited', 'joined', 'rejected'] as const; const allowedStatus = ['invited', 'joined', 'rejected'] as const;
export type AllowedMemberStatus = (typeof allowedStatus)[number]; export type AllowedMemberStatus = (typeof allowedStatus)[number];
@ -18,6 +19,7 @@ export type UserTeamItem = {
name: string; name: string;
avatar?: string; avatar?: string;
roadmaps: string[]; roadmaps: string[];
type: ValidTeamType;
role: AllowedRoles; role: AllowedRoles;
status: AllowedMemberStatus; status: AllowedMemberStatus;
memberId: string; memberId: string;

@ -16,6 +16,8 @@ import CloseIcon from '../../icons/close.svg';
import { useToast } from '../../hooks/use-toast'; import { useToast } from '../../hooks/use-toast';
import { useAuth } from '../../hooks/use-auth'; import { useAuth } from '../../hooks/use-auth';
import { pageProgressMessage } from '../../stores/page'; import { pageProgressMessage } from '../../stores/page';
import { useStore } from '@nanostores/preact';
import { $currentTeam } from '../../stores/team';
export type ProgressMapProps = { export type ProgressMapProps = {
member: TeamMember; member: TeamMember;
@ -44,6 +46,7 @@ export function MemberProgressModal(props: ProgressMapProps) {
} = props; } = props;
const user = useAuth(); const user = useAuth();
const isCurrentUser = user?.email === member.email; const isCurrentUser = user?.email === member.email;
const currentTeam = useStore($currentTeam);
const containerEl = useRef<HTMLDivElement>(null); const containerEl = useRef<HTMLDivElement>(null);
const popupBodyEl = useRef<HTMLDivElement>(null); const popupBodyEl = useRef<HTMLDivElement>(null);
@ -275,14 +278,17 @@ export function MemberProgressModal(props: ProgressMapProps) {
return ( return (
<div class="fixed left-0 right-0 top-0 z-50 h-full items-center justify-center overflow-y-auto overflow-x-hidden overscroll-contain bg-black/50"> <div class="fixed left-0 right-0 top-0 z-50 h-full items-center justify-center overflow-y-auto overflow-x-hidden overscroll-contain bg-black/50">
<div class="relative mx-auto h-full w-full max-w-4xl p-4 md:h-auto"> <div
id={currentTeam?.type === 'company' ? 'customized-roadmap' : 'original-roadmap'}
class="relative mx-auto h-full w-full max-w-4xl p-4 md:h-auto"
>
<div <div
ref={popupBodyEl} ref={popupBodyEl}
class="popup-body relative rounded-lg bg-white shadow pt-[1px]" class="popup-body relative rounded-lg bg-white pt-[1px] shadow"
> >
{isCurrentUser && ( {isCurrentUser && (
<div className="sticky top-1 mx-1 mt-1 mb-0 rounded-xl bg-gray-900 p-4 text-gray-300"> <div className="sticky top-1 mx-1 mb-0 mt-1 rounded-xl bg-gray-900 p-4 text-gray-300">
<h2 className={'text-base mb-1.5'}> <h2 className={'mb-1.5 text-base'}>
Follow the Instructions below to update your progress Follow the Instructions below to update your progress
</h2> </h2>
<ul className="flex flex-col gap-1"> <ul className="flex flex-col gap-1">
@ -385,7 +391,11 @@ export function MemberProgressModal(props: ProgressMapProps) {
</p> </p>
</div> </div>
<div ref={containerEl} className="px-4 pb-2"></div> <div
id="resource-svg-wrap"
ref={containerEl}
className="px-4 pb-2"
></div>
{isLoading && ( {isLoading && (
<div class="flex w-full justify-center"> <div class="flex w-full justify-center">
@ -398,7 +408,9 @@ export function MemberProgressModal(props: ProgressMapProps) {
<button <button
type="button" type="button"
className={`absolute right-2.5 top-3 ml-auto inline-flex items-center rounded-lg bg-transparent p-1.5 text-sm text-gray-400 hover:text-gray-900 lg:hidden ${isCurrentUser ? 'hover:bg-gray-800' : 'hover:bg-gray-100'}`} className={`absolute right-2.5 top-3 ml-auto inline-flex items-center rounded-lg bg-transparent p-1.5 text-sm text-gray-400 hover:text-gray-900 lg:hidden ${
isCurrentUser ? 'hover:bg-gray-800' : 'hover:bg-gray-100'
}`}
onClick={onClose} onClick={onClose}
> >
<img alt={'close'} src={CloseIcon} className="h-4 w-4" /> <img alt={'close'} src={CloseIcon} className="h-4 w-4" />

Loading…
Cancel
Save