Skip to content

Addresses Frontend Improvements of the Admin Page #1167

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

Draft
Ishfaq-code wants to merge 1 commit into
base: issue/1089-admin_page_loading_issues_2
Choose a base branch
from
Draft

Addresses Frontend Improvements of the Admin Page #1167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions assets/js/Components/Admin/CoursesPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import SortableTable from "../Widgets/SortableTable";
import Api from "../../Services/Api";
import SummaryIcon from "../Icons/SummaryIcon";
import ReportIcon from "../Icons/ReportIcon";
import ProgressIcon from "../Icons/ProgressIcon";

export default function CoursePage({
t,
Expand All @@ -15,6 +16,7 @@ export default function CoursePage({
addMessage,
}) {
const [filteredCourses, setFilteredCourses] = useState([]);
const [currentCourseScan, setCurrentCourseScan] = useState(-1)
const [isAnyScanning, setIsAnyScanning] = useState(false);
const [tableSettings, setTableSettings] = useState({
sortBy: "lastUpdated",
Expand Down Expand Up @@ -154,7 +156,7 @@ export default function CoursePage({
>
<ReportIcon className="icon-md" />
</button>
<button
{course.id == currentCourseScan ? <ProgressIcon className="icon-lg udoit-suggestion spinner" /> : <button
key={`scanButton${course.id}`}
onClick={() => {
!course.loading && !isAnyScanning && handleScanClick(course);
Expand All @@ -166,7 +168,7 @@ export default function CoursePage({
aria-label={t("report.button.scan")}
>
<SummaryIcon className="icon-md" />
</button>
</button>}
</div>
),
};
Expand Down Expand Up @@ -247,6 +249,7 @@ export default function CoursePage({
const handleScanClick = (course) => {
let api = new Api(settings);
setIsAnyScanning(true);
setCurrentCourseScan(course.id)

// For unscanned courses, course.id will be the LMS course ID (string/number)
// and hasReport will be false. We need to create the course in UDOIT first.
Expand Down Expand Up @@ -306,6 +309,7 @@ export default function CoursePage({
});
}
}
setCurrentCourseScan(-1)
})
.catch((error) => {
console.error("Scan error:", error);
Expand All @@ -317,6 +321,7 @@ export default function CoursePage({
course.loading = false;
handleCourseUpdate(course);
setIsAnyScanning(false);
setCurrentCourseScan(-1)
});
} else {
// For already scanned courses, use the UDOIT database ID
Expand All @@ -339,6 +344,7 @@ export default function CoursePage({
});
}
}
setCurrentCourseScan(-1)
})
.catch((error) => {
console.error("Scan error:", error);
Expand All @@ -350,6 +356,7 @@ export default function CoursePage({
course.loading = false;
handleCourseUpdate(course);
setIsAnyScanning(false);
setCurrentCourseScan(-1)
});
}

Expand All @@ -361,6 +368,7 @@ export default function CoursePage({

course.loading = true;
handleCourseUpdate(course);

};

const checkForReport = (course) => {
Expand Down
Loading