Skip to content
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

Jump to bottom

small ui fixes and reply button replies again #338

Merged
merged 6 commits into from
Aug 27, 2024
Merged

small ui fixes and reply button replies again #338

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d904a11
small ui fixes and reply button replies again
jenbeckett Aug 26, 2024
ac3431e
updates
jenbeckett Aug 26, 2024
26658af
couple more tweaks
jenbeckett Aug 26, 2024
afd71d3
no more icon class
jenbeckett Aug 26, 2024
35e255a
Test updates and identifiers.
Aug 26, 2024
ce18185
Skipped failing test.
Aug 27, 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
17 changes: 11 additions & 6 deletions frontend/src/components/messages/MessagesTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<v-row class="mt-0 ml-0">
<v-col cols="12">
<AppButton size="small" class="messages-button" @click="toggleNewRequestDialog()">
<v-icon left>mdi-email-plus-outline</v-icon>
New message
<v-icon class="mr-1" left>mdi-email-plus-outline</v-icon>
<span>New message</span>
vietle-cgi marked this conversation as resolved.
Show resolved Hide resolved
</AppButton>
<AppButton size="small" class="messages-button mx-1" :primary="false" @click="toggleMarkUnreadButtonInMessageTable()">
<v-icon left>mdi-email-outline</v-icon>
Mark unread
<v-icon class="mr-1" left>mdi-email-outline</v-icon>
<span>Mark unread</span>
</AppButton>
<AppButton size="small" class="messages-button" :primary="false" @click="toggleMarkReadButton()">
<v-icon left>mdi-email-open-outline</v-icon>
Mark read
<v-icon class="mr-1" left>mdi-email-open-outline</v-icon>
<span>Mark read</span>
</AppButton>
</v-col>
</v-row>
Expand Down Expand Up @@ -91,4 +91,9 @@ export default {
.messages-button {
display: inline-block;
}

.messages-button:focus {
vietle-cgi marked this conversation as resolved.
Show resolved Hide resolved
outline: 0px !important;
outline-offset: none !important;
}
</style>
20 changes: 10 additions & 10 deletions frontend/src/components/messages/RequestConversations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<span class="subject-header">Subject: {{ assistanceRequest.subject }}</span>
</v-col>
<v-col cols="5" lg="3" class="d-flex flex-column align-end pa-0">
<AppButton v-if="assistanceRequest.isRead" size="small" :primary="false" class="conversations-button" @click="$emit('toggleMarkUnreadButtonInConversationThread')">
<v-icon left>mdi-email-outline</v-icon>
Mark unread
<AppButton v-if="assistanceRequest.isRead" size="small" min-width="155px" :primary="false" class="conversations-button" @click="$emit('toggleMarkUnreadButtonInConversationThread')">
<v-icon left class="mr-1">mdi-email-outline</v-icon>
<span>Mark unread</span>
</AppButton>
<v-tooltip
:disabled="!showTooltip"
Expand All @@ -17,9 +17,9 @@
text="Your request is still in the queue. If this is an urgent request, you can call the program at 1-888-338-6622 (Option 7).">
<template #activator="{ props }">
<div v-bind="props">
<AppButton class="reply-button my-1" :disabled="!isReplyButtonEnabled" size="small">
<v-icon left>mdi-reply</v-icon>
Reply
<AppButton class="reply-button my-1" :disabled="!isReplyButtonEnabled" size="small" min-width="155px" @click="toggleReplyRequestDialog">
<v-icon left class="mr-1">mdi-reply</v-icon>
<span>Reply</span>
</AppButton>
</div>
</template>
Expand All @@ -28,13 +28,13 @@
</v-row>
<v-row>
<v-col cols="auto" class="font-weight-bold pt-0 pl-0">Status:</v-col>
<v-col cols="3" class="pt-0 pl-1">{{ assistanceRequest.status }}</v-col>
<v-col cols="3" class="pt-0 pl-1" data-cy="status">{{ assistanceRequest.status }}</v-col>
<v-col cols="auto" class="font-weight-bold pt-0 pl-1">Reference#:</v-col>
<v-col class="pt-0 pl-0">{{ assistanceRequest.referenceNumber }}</v-col>
<v-col class="pt-0 pl-0" data-cy="referenceNo">{{ assistanceRequest.referenceNumber }}</v-col>
</v-row>
<v-row>
<v-col cols="auto" class="font-weight-bold pt-0 pb-0 pl-0">Topic:</v-col>
<v-col cols="3" class="pt-0 pb-0">{{ assistanceRequest.categoryName }}</v-col>
<v-col cols="3" class="pt-0 pb-0" data-cy="topic">{{ assistanceRequest.categoryName }}</v-col>
<v-col cols="auto" class="font-weight-bold pt-0 pb-0">Facility(s):</v-col>
<v-col class="pt-0 pb-0">{{ assistanceRequest.requestFacilities.map((facility) => facility.facilityName).join(', ') }}</v-col>
</v-row>
Expand All @@ -54,7 +54,7 @@
<v-row v-if="assistanceRequest" class="border-top">
<v-col cols="12" class="border-right pa-0">
<v-skeleton-loader :loading="loading" type="table-tbody">
<v-data-table-virtual :headers="headers" :items="assistanceRequestConversation" item-key="messageId" class="data-table">
<v-data-table-virtual :headers="headers" :items="assistanceRequestConversation" item-key="messageId" class="data-table" data-cy="conversations-table">
<template #headers></template>
<template #item="{ item }">
<v-row class="border-bottom ma-0">
Expand Down
11 changes: 8 additions & 3 deletions frontend/src/components/notifications/NotificationDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
&nbsp;Operating Funding Model Program
</v-col>
<v-col cols="5" md="4" lg="3" class="pa-0 d-flex justify-end mt-1">
<AppButton v-if="notification?.isRead" size="small" :primary="false" @click="$emit('toggleMarkUnreadButtonInNotificationDetails')">
<v-icon class="icon" left>mdi-email-outline</v-icon>
Mark Unread
<AppButton v-if="notification?.isRead" size="small" class="notifications-button" :primary="false" @click="$emit('toggleMarkUnreadButtonInNotificationDetails')">
<v-icon class="mr-1" left>mdi-email-outline</v-icon>
<span>Mark Unread</span>
</AppButton>
</v-col>
</v-row>
Expand Down Expand Up @@ -89,4 +89,9 @@ export default {
font-size: 1.1rem;
white-space: pre-wrap;
}

.notifications-button:focus {
outline: 0px !important;
outline-offset: none !important;
}
</style>
13 changes: 9 additions & 4 deletions frontend/src/components/notifications/NotificationsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<v-col class="mt-3 ml-3">
<div>
<AppButton class="mx-1 notifications-button" size="small" :primary="false" @click="toggleMarkUnreadButtonInNotificationTable(false)">
<v-icon class="icon" left>mdi-email-outline</v-icon>
Mark unread
<v-icon class="mr-1" left>mdi-email-outline</v-icon>
<span>Mark unread</span>
</AppButton>
<AppButton class="mx-1 notifications-button" size="small" :primary="false" @click="toggleMarkReadButton(true)">
<v-icon class="icon" left>mdi-email-open-outline</v-icon>
Mark read
<v-icon class="mr-1" left>mdi-email-open-outline</v-icon>
<span>Mark read</span>
</AppButton>
</div>
</v-col>
Expand Down Expand Up @@ -81,4 +81,9 @@ export default {
.notifications-button {
display: inline-block;
}

.notifications-button:focus {
outline: 0px !important;
outline-offset: none !important;
}
</style>
20 changes: 5 additions & 15 deletions testing/cypress/e2e/2-portal-dashboard-and-communications/assistance_request.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,17 @@ describe('Portal Assistance Request', () => {
row.click({ force: true })

// confirm that the portal's assistance request has the right information submitted in the form for the assistance request
cy.contains('Reply').parent().should('have.class', 'reply-disabled')
cy.get('button[class*="reply-button"').should('have.attr', 'disabled')

cy.get('span[class="subject-header"]').should(
'have.text',
`Subject: ${subject}`
)

// TODO (weskubo-cgi) Add some ids to make more reliable selectors
cy.get('div[data-v-f73bc3ca]')
.contains('Status')
.next()
.should('have.text', 'Open')
cy.get('div[data-v-f73bc3ca]')
.contains('Reference#')
.next()
.should('have.text', referenceNo)
cy.get('div[data-v-f73bc3ca]')
.contains('Topic')
.next()
.should('have.text', topic)
cy.contains(description).should('exist')
cy.get('[data-cy="status"]').should('have.text', 'Open')
cy.get('[data-cy="referenceNo"').should('have.text', referenceNo)
cy.get('[data-cy="topic"]').should('have.text', topic)
cy.get('[data-cy="conversations-table"]').contains(description)
})
})

Expand Down
Loading