diff --git a/src/interface/pages/settings/general.svelte b/src/interface/pages/settings/general.svelte index 3b916dd9..7bc7ecc9 100644 --- a/src/interface/pages/settings/general.svelte +++ b/src/interface/pages/settings/general.svelte @@ -45,6 +45,7 @@ } import { getAllPluginSettings } from "@/plugins" + import { isSeqtaEngageExperience } from "@/seqta/utils/isSeqtaEngage" import type { BooleanSetting, StringSetting, NumberSetting, SelectSetting, ButtonSetting, HotkeySetting, ComponentSetting } from "@/plugins/core/types" // Union type representing all possible settings @@ -79,7 +80,9 @@ settings: Record; } - const pluginSettings = getAllPluginSettings() as Plugin[]; + const pluginSettings = getAllPluginSettings().filter( + (plugin) => !(isSeqtaEngageExperience() && plugin.pluginId === "global-search"), + ) as Plugin[]; const pluginSettingsValues = $state>>({}); let cloudState = $state(cloudAuth.state); diff --git a/src/plugins/built-in/assessmentsAverage/engage.ts b/src/plugins/built-in/assessmentsAverage/engage.ts index 07b7c1e0..1010e74a 100644 --- a/src/plugins/built-in/assessmentsAverage/engage.ts +++ b/src/plugins/built-in/assessmentsAverage/engage.ts @@ -1,13 +1,4 @@ -const ENGAGE_STUDENT_STORAGE_KEY = () => - `bsplus.engageTimetable.student.${location.origin}`; - -/** Engage assessments URLs: /#?page=/assessments/{studentId}/{programme}:{metaclass}:{studentId} */ -export function getEngageAssessmentStudentId(): string | null { - const hashMatch = window.location.hash.match(/\/assessments\/(\d+)/); - if (hashMatch?.[1]) return hashMatch[1]; - - return localStorage.getItem(ENGAGE_STUDENT_STORAGE_KEY()); -} +import { getEngageAssessmentStudentId } from "@/seqta/utils/engageAssessmentStudent"; function randomEngagePdfFileName(): string { const token = Math.random().toString(36).slice(2, 10); diff --git a/src/plugins/built-in/assessmentsAverage/utils.ts b/src/plugins/built-in/assessmentsAverage/utils.ts index f720cd19..4bdc044c 100644 --- a/src/plugins/built-in/assessmentsAverage/utils.ts +++ b/src/plugins/built-in/assessmentsAverage/utils.ts @@ -1,9 +1,9 @@ import { getUserInfo } from "@/seqta/ui/AddBetterSEQTAElements.ts"; import ReactFiber from "@/seqta/utils/ReactFiber.ts"; import { isSeqtaEngageExperience } from "@/seqta/utils/isSeqtaEngage"; +import { getEngageAssessmentStudentId } from "@/seqta/utils/engageAssessmentStudent"; import { getEngageAssessmentReportUrl, - getEngageAssessmentStudentId, requestEngageAssessmentPdf, } from "./engage.ts"; import { diff --git a/src/plugins/built-in/assessmentsOverview/AssessmentsOverview.svelte b/src/plugins/built-in/assessmentsOverview/AssessmentsOverview.svelte index 821f4b2e..c30c1835 100644 --- a/src/plugins/built-in/assessmentsOverview/AssessmentsOverview.svelte +++ b/src/plugins/built-in/assessmentsOverview/AssessmentsOverview.svelte @@ -1,12 +1,15 @@ @@ -352,6 +383,14 @@

Assessments

+ {#if showStudentFilter} + + {/if}