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

[#11126] Expand empty search results for feedback session logs #11151

Merged
merged 9 commits into from
Jun 5, 2021
Merged

[#11126] Expand empty search results for feedback session logs #11151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fe940fb
Modify isTabExpanded initialization
hoonti06 May 24, 2021
1cf3d58
Merge branch 'master' into 11126-instructor-checking-logs-expand-resu…
madanalogy May 28, 2021
9cc0eef
Merge branch 'master' into 11126-instructor-checking-logs-expand-resu…
hoonti06 May 28, 2021
4fa418b
Merge branch 'master' into 11126-instructor-checking-logs-expand-resu…
rrtheonlyone May 29, 2021
aa34703
Merge branch 'master' into 11126-instructor-checking-logs-expand-resu…
hoonti06 May 31, 2021
6611d6d
Modified that if expand button does not exist and only collapse butto…
hoonti06 May 31, 2021
d52dfee
Modified that if there is no panel expand button, the session is skipped
hoonti06 May 31, 2021
7f7b310
Modified that click the expand button only when it exists
hoonti06 May 31, 2021
f9edcc4
Modified that get the session name from the element with class name '…
hoonti06 Jun 2, 2021
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
6 changes: 4 additions & 2 deletions src/e2e/java/teammates/e2e/pageobjects/InstructorAuditLogsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ public void startSearching() {
logsOutput
.findElements(By.className("card"))
.forEach(card -> {
String sessionName = card.getText().trim();
click(card.findElement(By.className("fa-chevron-down")));
if (!card.findElements(By.className("fa-chevron-down")).isEmpty()) {
click(card.findElement(By.className("fa-chevron-down")));
}
String sessionName = card.findElement(By.className("card-header")).getText().trim();
isLogPresentForSession.put(sessionName, !card.findElements(By.className("card-body")).isEmpty());
});
}
Expand Down
2 changes: 1 addition & 1 deletion ...b/app/pages-instructor/instructor-audit-logs-page/instructor-audit-logs-page.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export class InstructorAuditLogsPageComponent implements OnInit {

private toFeedbackSessionLogModel(log: FeedbackSessionLog): FeedbackSessionLogModel {
return {
isTabExpanded: false,
isTabExpanded: log.feedbackSessionLogEntries.length === 0,
feedbackSessionName: log.feedbackSessionData.feedbackSessionName,
logColumnsData: [
{ header: 'Time', sortBy: SortBy.LOG_DATE },
Expand Down