Skip to content

Commit dc20654

Browse files
authored
Merge pull request #85 from SafeExamBrowser/Refactor-Create-UserAccount
Refactor create user account
2 parents ca1ee2a + 5fd9481 commit dc20654

31 files changed

Lines changed: 639 additions & 726 deletions

File tree

client/src/components/layout/ContainerLayout.vue

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,11 +576,6 @@ onMounted(async () => {
576576
}
577577
});
578578
579-
// watch(userRoles, (roles) => {
580-
// ability.update(defineRulesForRoles(roles).rules)
581-
// console.log("user roles: ", userRoles.value)
582-
// }, { immediate: true })
583-
584579
watch(languageToggle, () => {
585580
locale.value = languageToggle.value === 0 ? "en" : "de";
586581
localStorage.setItem("locale", locale.value);

client/src/components/views/seb-server/accounts/CreateUserAccount.vue

Lines changed: 0 additions & 651 deletions
This file was deleted.

client/src/components/views/seb-server/monitoring/overview/dialogs/AskDialog.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,6 @@ function onGrantKey() {
493493
const val = grantKeyInput.value;
494494
495495
if (!examId || !firstConnId.value || !val) {
496-
console.log("failed");
497-
console.log(examId, selectedAsk.value?.keyValue, val);
498496
return;
499497
}
500498
examService.grantExamAppSignatureKeys(

client/src/components/views/seb-server/settings-navigation/assessment-tool/assessment-tools/AssessmentTools.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<template #ActionButton>
44
<AddButton
55
text="assessmentToolConnections.assessmentToolsPage.addAssessmentTool"
6-
:route="CREATE_ASSESSMENT_TOOL_CONNECTION_ROUTE"
6+
:route="{ name: 'CreateAssessmentTool' }"
77
/>
88
</template>
99

@@ -70,10 +70,7 @@
7070
import { computed, ref, watch } from "vue";
7171
import BasicSettingsPage from "@/components/layout/pages/BasicSettingsPage.vue";
7272
import AddButton from "@/components/views/seb-server/settings-navigation/widgets/AddButton.vue";
73-
import {
74-
ASSESSMENT_TOOL_CONNECTIONS_ROUTE,
75-
CREATE_ASSESSMENT_TOOL_CONNECTION_ROUTE,
76-
} from "@/utils/constants.ts";
73+
import { ASSESSMENT_TOOL_CONNECTIONS_ROUTE } from "@/utils/constants.ts";
7774
import SearchSection from "@/components/views/seb-server/settings-navigation/components/SearchSection.vue";
7875
import SettingsFilters from "@/components/views/seb-server/settings-navigation/components/SettingsFilters.vue";
7976
import SettingsTable from "@/components/views/seb-server/settings-navigation/components/SettingsTable/SettingsTable.vue";

client/src/components/views/seb-server/settings-navigation/certificate/certificates/CertificatesList.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<template #ActionButton>
44
<AddButton
55
text="certificates.addCertificate"
6-
:route="CERTIFICATES_ROUTE"
6+
:route="{ name: 'CreateCertificate' }"
77
/>
88
</template>
99

@@ -58,7 +58,6 @@
5858
import { computed, ref, watch } from "vue";
5959
import BasicSettingsPage from "@/components/layout/pages/BasicSettingsPage.vue";
6060
import AddButton from "@/components/views/seb-server/settings-navigation/widgets/AddButton.vue";
61-
import { CERTIFICATES_ROUTE } from "@/utils/constants.ts";
6261
import SearchSection from "@/components/views/seb-server/settings-navigation/components/SearchSection.vue";
6362
import SettingsTable from "@/components/views/seb-server/settings-navigation/components/SettingsTable/SettingsTable.vue";
6463
import { useCertificatesStore } from "@/components/views/seb-server/settings-navigation/certificate/certificates/store/certificatesStore.ts";

client/src/components/views/seb-server/settings-navigation/components/SearchSection.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/>
1616
</v-row>
1717

18-
<v-row class="justify-end pa-6 pt-5 pb-0">
18+
<v-row class="justify-end pa-6 pt-4 pb-0">
1919
<CancelButton
2020
:text="'general.cancelButton'"
2121
@click="emit('clear')"

client/src/components/views/seb-server/settings-navigation/components/SettingsFilters.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</template>
3030

3131
<script setup lang="ts">
32-
import { computed, watchEffect } from "vue";
32+
import { computed } from "vue";
3333
import { SettingsFilterDefinition } from "@/models/types.ts";
3434
3535
const props = defineProps<{
@@ -51,10 +51,6 @@ function toggleFilter(key: string, value: string) {
5151
[key]: props.modelValue[key] === value ? null : value,
5252
});
5353
}
54-
watchEffect(() => {
55-
console.log("[SettingsFilters.vue] props.filters", props.filters);
56-
console.log("[SettingsFilters.vue] visibleFilters", visibleFilters.value);
57-
});
5854
</script>
5955

6056
<style scoped>

client/src/components/views/seb-server/settings-navigation/connection-configuration/connection-configurations/ConnectionConfigurations.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<template #ActionButton>
44
<AddButton
55
text="connectionConfigurations.connectionConfigurationsPage.addConnectionConfiguration"
6-
:route="CREATE_CONNECTION_CONFIGURATION_ROUTE"
6+
:route="{ name: 'CreateConnectionConfiguration' }"
77
/>
88
</template>
99

@@ -71,10 +71,7 @@
7171
import { computed, ref, watch } from "vue";
7272
import BasicSettingsPage from "@/components/layout/pages/BasicSettingsPage.vue";
7373
import AddButton from "@/components/views/seb-server/settings-navigation/widgets/AddButton.vue";
74-
import {
75-
CONNECTION_CONFIGURATIONS_ROUTE,
76-
CREATE_CONNECTION_CONFIGURATION_ROUTE,
77-
} from "@/utils/constants.ts";
74+
import { CONNECTION_CONFIGURATIONS_ROUTE } from "@/utils/constants.ts";
7875
import SearchSection from "@/components/views/seb-server/settings-navigation/components/SearchSection.vue";
7976
import SettingsFilters from "@/components/views/seb-server/settings-navigation/components/SettingsFilters.vue";
8077
import SettingsTable from "@/components/views/seb-server/settings-navigation/components/SettingsTable/SettingsTable.vue";

client/src/components/views/seb-server/settings-navigation/user-account/api/useCreateUserAccount.ts

Whitespace-only changes.

client/src/components/views/seb-server/settings-navigation/user-account/userAccounts/api/useDeleteUserAccount.ts renamed to client/src/components/views/seb-server/settings-navigation/user-account/api/useDeleteUserAccount.ts

File renamed without changes.

0 commit comments

Comments
 (0)