Skip to content

Removes task requests dev flag #1056

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jan 1, 2024
Merged

Removes task requests dev flag #1056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb60df7
chore: removes task requests dev flag
Ajeyakrishna-k Dec 22, 2023
abae5fc
chore: remove brackets
Ajeyakrishna-k Dec 22, 2023
1db7962
fix: remove dev flag from test cases
Ajeyakrishna-k Dec 22, 2023
f5d5bd6
fix: dashboard site task requests link
Ajeyakrishna-k Dec 22, 2023
71f8e8e
Merge branch 'develop' into refactor/remove-task-request-dev-flag
Ajeyakrishna-k Dec 30, 2023
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
33 changes: 5 additions & 28 deletions __tests__/Unit/Components/Issues/Card.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('Issue card', () => {
expect(
screen.getByText(issuesResponseSearchedWithQuery[0].html_url)
).toBeInTheDocument();
expect(screen.getByRole('button')).toHaveTextContent('Convert to task');
expect(screen.getByRole('button')).toHaveTextContent('Convert to Task');
});

test('Should render issue created by information correctly', () => {
Expand Down Expand Up @@ -115,36 +115,19 @@ describe('Issue card', () => {
expect(markdownElement2).toBeInTheDocument();
});

test('Should render action form when dev mode is enabled', () => {
const screen = renderWithRouter(
<Provider store={store()}>
<Card issue={issuesResponseSearchedWithQuery[0]} />
</Provider>,
{
query: { dev: 'true' },
}
);
expect(screen.getByRole('button')).toHaveTextContent('Convert to Task');
});
test('should render issue card with convert to task button', () => {
const screen = renderWithRouter(
<Provider store={store()}>
<Card issue={issuesResponseSearchedWithQuery[0]} />
</Provider>,
{
query: { dev: 'true' },
}
</Provider>
);
expect(screen.getByRole('button')).toHaveTextContent('Convert to Task');
});
test('should open a modal when button is clicked', () => {
const screen = renderWithRouter(
<Provider store={store()}>
<Card issue={issuesResponseSearchedWithQuery[0]} />
</Provider>,
{
query: { dev: 'true' },
}
</Provider>
);
const convertToTaskButton = screen.getByText(/Convert to Task/i);
fireEvent.click(convertToTaskButton);
Expand All @@ -157,10 +140,7 @@ describe('Issue card', () => {
const screen = renderWithRouter(
<Provider store={store()}>
<Card issue={issuesResponseSearchedWithQuery[0]} />
</Provider>,
{
query: { dev: 'true' },
}
</Provider>
);
const convertToTaskButton = screen.getByText(/Convert to Task/i);
fireEvent.click(convertToTaskButton);
Expand Down Expand Up @@ -188,10 +168,7 @@ describe('Issue card', () => {
taskId: undefined,
}}
/>
</Provider>,
{
query: { dev: 'true' },
}
</Provider>
);
const convertToTaskButton = screen.getByText(/Convert to Task/i);
fireEvent.click(convertToTaskButton);
Expand Down
60 changes: 22 additions & 38 deletions src/components/issues/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ const Card: FC<IssueCardProps> = ({ issue }) => {
const date = new Date(issue.created_at).toDateString();
const [taskExists, setTaskExists] = useState(issue.taskExists ?? false);
const [isLoading, setIsLoading] = useState(false);
const router = useRouter();
const devMode = router.query.dev === 'true' ? true : false;
const { data: userData, isUserAuthorized } = useUserData();
const [taskId, setTaskId] = useState(issue.taskId);
const [requestId, setRequestId] = useState<string>();
Expand Down Expand Up @@ -209,42 +207,28 @@ const Card: FC<IssueCardProps> = ({ issue }) => {
</div>
</div>
<div className={styles.actions}>
{devMode ? (
<>
<button
className={styles.card__top__button}
disabled={isTaskButtonDisabled}
onClick={toggle}
>
{isUserAuthorized
? 'Convert to Task'
: 'Request as Task'}
</button>
<TaskManagementModal
isUserAuthorized={isUserAuthorized}
isOpen={isTaskModalOpen}
toggle={toggle}
assignee={assignee}
taskId={taskId}
requestId={requestId}
handleCreateTask={handleCreateTask}
handleCreateTaskRequest={handleCreateTaskRequest}
handleUpdateTask={handleUpdateTask}
/>
</>
) : (
<>
<button
className={styles.card__top__button}
disabled={
taskExists || isLoading || !isUserAuthorized
}
onClick={handleClick}
>
Convert to task
</button>
</>
)}
<>
<button
className={styles.card__top__button}
disabled={isTaskButtonDisabled}
onClick={toggle}
>
{isUserAuthorized
? 'Convert to Task'
: 'Request as Task'}
</button>
<TaskManagementModal
isUserAuthorized={isUserAuthorized}
isOpen={isTaskModalOpen}
toggle={toggle}
assignee={assignee}
taskId={taskId}
requestId={requestId}
handleCreateTask={handleCreateTask}
handleCreateTaskRequest={handleCreateTaskRequest}
handleUpdateTask={handleUpdateTask}
/>
</>
</div>
</div>
);
Expand Down
46 changes: 22 additions & 24 deletions src/components/taskDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,31 +476,29 @@ const TaskDetails: FC<Props> = ({ taskID }) => {
Update Progress
</button>
</TaskContainer>
{isDevModeEnabled && (
<div>
<TaskContainer
hasImg={false}
title="Request for task"
<div>
<TaskContainer
hasImg={false}
title="Request for task"
>
<button
data-testid="request-task-button"
className={classNames.button}
onClick={toggleTaskRequestModal}
>
<button
data-testid="request-task-button"
className={classNames.button}
onClick={toggleTaskRequestModal}
>
Request for task
</button>
<TaskManagementModal
isUserAuthorized={false}
isOpen={isTaskModalOpen}
toggle={toggleTaskRequestModal}
requestId={requestId}
handleCreateTaskRequest={
handleCreateTaskRequest
}
/>
</TaskContainer>
</div>
)}
Request for task
</button>
<TaskManagementModal
isUserAuthorized={false}
isOpen={isTaskModalOpen}
toggle={toggleTaskRequestModal}
requestId={requestId}
handleCreateTaskRequest={
handleCreateTaskRequest
}
/>
</TaskContainer>
</div>
</section>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/constants/url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ export const MAIN_SITE_URL = 'https://www.realdevsquad.com';
export const MY_SITE_URL = 'https://my.realdevsquad.com';
export const DASHBOARD_URL = 'https://dashboard.realdevsquad.com';
export const USER_MANAGEMENT_URL = `${DASHBOARD_URL}/users/details/`;
export const TASK_REQUESTS_DETAILS_URL = `${DASHBOARD_URL}/taskRequests/details/`;
export const TASK_REQUESTS_DETAILS_URL = `${DASHBOARD_URL}/task-requests/details/`;
2 changes: 1 addition & 1 deletion src/pages/issues/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Issues: FC = () => {
const fetchIssues = async (searchText = '') => {
try {
setIsLoading(true);
const res = await fetch(`${ISSUES_URL}?dev=true&q=${searchText}`);
const res = await fetch(`${ISSUES_URL}?q=${searchText}`);
const data = await res.json();
if ('issues' in data) {
// GitHub treats issues and PRs as issues
Expand Down