Skip to content

observation/FOUR-13916 The options menu and the eye leave the margin of a task row #6120

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
ryancooley merged 2 commits into from
Feb 2, 2024
Merged

observation/FOUR-13916 The options menu and the eye leave the margin of a task row #6120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d68c89
fix tasks list preview tooltip
gustavobascope Jan 30, 2024
6db2bd2
Merge branch 'next' into observation/FOUR-13916
gustavobascope Feb 1, 2024
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
14 changes: 6 additions & 8 deletions resources/js/tasks/components/TasksList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ export default {
};
},
formatDueDate(date) {
return moment(date).format("MM/DD/YY HH:mm");
return date === null ? "-" : moment(date).format("MM/DD/YY HH:mm");
},
formatColorBadge(date) {
const days = this.remainingTime(date);
Expand All @@ -425,6 +425,10 @@ export default {
return `${daysRemaining}D`;
},
remainingTime(date) {
if (date === "-" || date === null) {
return 0;
}

const currentDate = new Date();
const formatDate = moment(date).format("YYYY-MM-DD");
const endDate = new Date(formatDate);
Expand All @@ -446,13 +450,7 @@ export default {
const rectTableContainer = tableContainer.getBoundingClientRect();
const topAdjust = rectTableContainer.top;

const tasksAlert = document.querySelector('[data-cy="tasks-alert"]');
let elementHeight = tasksAlert ? tasksAlert.clientHeight - 14 : 0;

const savedSearch = this.verifyURL("saved-searches");
if (savedSearch) {
elementHeight += 36;
}
let elementHeight = 36;

this.isTooltipVisible = true;
this.tooltipRowData = row;
Expand Down