From a5006a17fa112a77f6a9b019cf26697f4a2d7d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20=C3=96hlerking?= Date: Mon, 26 Aug 2024 13:59:27 +0200 Subject: [PATCH] review changes --- src/layouts/index.ts | 1 - src/modules/page/Login.page.unit.ts | 2 +- src/serverApi/v3/api/courses-api.ts | 20 +++++++++---------- .../v3/models/import-user-response.ts | 6 ++++++ 4 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 src/layouts/index.ts diff --git a/src/layouts/index.ts b/src/layouts/index.ts deleted file mode 100644 index aa5ba94..0000000 --- a/src/layouts/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./layouts.enum"; diff --git a/src/modules/page/Login.page.unit.ts b/src/modules/page/Login.page.unit.ts index e77193a..d224314 100644 --- a/src/modules/page/Login.page.unit.ts +++ b/src/modules/page/Login.page.unit.ts @@ -1,3 +1,4 @@ +import { postLoginRoute } from "@/router/postLoginRoute"; import { createTestingI18n, createTestingVuetify, @@ -8,7 +9,6 @@ import { createTestingPinia } from "@pinia/testing"; import { mount } from "@vue/test-utils"; import { setActivePinia } from "pinia"; import { Router, useRouter } from "vue-router"; -import { postLoginRoute } from "../../router/postLoginRoute"; import LoginPage from "./Login.page.vue"; jest.mock("vue-router"); diff --git a/src/serverApi/v3/api/courses-api.ts b/src/serverApi/v3/api/courses-api.ts index dc8037b..7c5f3bb 100644 --- a/src/serverApi/v3/api/courses-api.ts +++ b/src/serverApi/v3/api/courses-api.ts @@ -132,10 +132,10 @@ export const CoursesApiAxiosParamCreator = function (configuration?: Configurati * @param {*} [options] Override http request option. * @throws {RequiredError} */ - courseControllerGetCourseById: async (courseId: string, options: any = {}): Promise => { + courseControllerGetCourseCcMetadataById: async (courseId: string, options: any = {}): Promise => { // verify required parameter 'courseId' is not null or undefined - assertParamExists('courseControllerGetCourseById', 'courseId', courseId) - const localVarPath = `/courses/{courseId}` + assertParamExists('courseControllerGetCourseCcMetadataById', 'courseId', courseId) + const localVarPath = `/courses/{courseId}/cc-metadata` .replace(`{${"courseId"}}`, encodeURIComponent(String(courseId))); // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -324,8 +324,8 @@ export const CoursesApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async courseControllerGetCourseById(courseId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.courseControllerGetCourseById(courseId, options); + async courseControllerGetCourseCcMetadataById(courseId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.courseControllerGetCourseCcMetadataById(courseId, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, /** @@ -399,8 +399,8 @@ export const CoursesApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - courseControllerGetCourseById(courseId: string, options?: any): AxiosPromise { - return localVarFp.courseControllerGetCourseById(courseId, options).then((request) => request(axios, basePath)); + courseControllerGetCourseCcMetadataById(courseId: string, options?: any): AxiosPromise { + return localVarFp.courseControllerGetCourseCcMetadataById(courseId, options).then((request) => request(axios, basePath)); }, /** * @@ -470,7 +470,7 @@ export interface CoursesApiInterface { * @throws {RequiredError} * @memberof CoursesApiInterface */ - courseControllerGetCourseById(courseId: string, options?: any): AxiosPromise; + courseControllerGetCourseCcMetadataById(courseId: string, options?: any): AxiosPromise; /** * @@ -544,8 +544,8 @@ export class CoursesApi extends BaseAPI implements CoursesApiInterface { * @throws {RequiredError} * @memberof CoursesApi */ - public courseControllerGetCourseById(courseId: string, options?: any) { - return CoursesApiFp(this.configuration).courseControllerGetCourseById(courseId, options).then((request) => request(this.axios, this.basePath)); + public courseControllerGetCourseCcMetadataById(courseId: string, options?: any) { + return CoursesApiFp(this.configuration).courseControllerGetCourseCcMetadataById(courseId, options).then((request) => request(this.axios, this.basePath)); } /** diff --git a/src/serverApi/v3/models/import-user-response.ts b/src/serverApi/v3/models/import-user-response.ts index ee0e1a4..1976a0b 100644 --- a/src/serverApi/v3/models/import-user-response.ts +++ b/src/serverApi/v3/models/import-user-response.ts @@ -69,6 +69,12 @@ export interface ImportUserResponse { * @memberof ImportUserResponse */ flagged: boolean; + /** + * exact user roles from the external system + * @type {Array} + * @memberof ImportUserResponse + */ + externalRoleNames?: Array; } /**