Revize db0f300f

Displaying username in navigation bar

webapp/api/api.ts

@@ -1160 +1160 @@
      */
     'users'?: Array<UserInfo> | null;
 }
+/**
+ * 
+ * @export
+ * @interface UserMeResponse
+ */
+export interface UserMeResponse {
+    /**
+     * 
+     * @type {string}
+     * @memberof UserMeResponse
+     */
+    'name'?: string | null;
+    /**
+     * 
+     * @type {ERole}
+     * @memberof UserMeResponse
+     */
+    'role'?: ERole;
+}
 
 /**
  * AnnotationApi - axios parameter creator
@@ -3160 +3179 @@
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        usersMeGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/users/me`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -3261 +3309 @@
             const localVarAxiosArgs = await localVarAxiosParamCreator.usersGet(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async usersMeGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserMeResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.usersMeGet(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {CreateUserRequest} [createUserRequest] 
@@ -3325 +3382 @@
         usersGet(options?: any): AxiosPromise<UserList> {
             return localVarFp.usersGet(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        usersMeGet(options?: any): AxiosPromise<UserMeResponse> {
+            return localVarFp.usersMeGet(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {CreateUserRequest} [createUserRequest] 
@@ -3398 +3463 @@
         return UserApiFp(this.configuration).usersGet(options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof UserApi
+     */
+    public usersMeGet(options?: AxiosRequestConfig) {
+        return UserApiFp(this.configuration).usersMeGet(options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {CreateUserRequest} [createUserRequest] 

webapp/components/navigation/AdminNavBar.tsx

@@ -1 @@
-import React, { useCallback, useContext } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { Menu } from 'antd';
 import { useRouter } from 'next/router';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
@@ -11 +11 @@
     faTags,
     faBookmark,
 } from '@fortawesome/free-solid-svg-icons';
+import { userController } from '../../controllers';
+import { UserInfo } from '../../api';
 
 const AdminNavBar = () => {
     const router = useRouter();
     const { logout } = useContext(LoggedUserContext);
     const { SubMenu } = Menu;
+    const [name, setName] = useState<string>('');
 
     const handleLogout = useCallback(() => {
         logout();
         router.push('/login');
     }, [logout, router]);
 
+    async function fetchUsername() {
+        let usr = (await userController.usersMeGet()).data.name;
+        setName(usr ? usr : '');
+    }
+
+    useEffect(() => {
+        fetchUsername();
+    }, []);
+
     return (
         <Menu theme="dark" mode="horizontal">
             <Menu.Item style={{}} key="1" onClick={() => router.push('/documents/admin')}>
@@ -37 +49 @@
                 <FontAwesomeIcon icon={faFileExport} /> Export
             </Menu.Item>
 
-            <SubMenu
-                icon={<FontAwesomeIcon icon={faUser} />}
-                key="account"
-                title={'Admin XY'} // TODO show username
-            >
+            <SubMenu icon={<FontAwesomeIcon icon={faUser} />} key="account" title={name}>
                 <Menu.Item key="setting:2" onClick={() => handleLogout()}>
                     Odhlásit se
                 </Menu.Item>

webapp/components/navigation/UserNavBar.tsx

@@ -1 @@
-import React, { useCallback, useContext } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { Menu } from 'antd';
 import { useRouter } from 'next/router';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faFileLines, faUser } from '@fortawesome/free-solid-svg-icons';
 import { LoggedUserContext } from '../../contexts/LoggedUserContext';
+import { userController } from '../../controllers';
 
 const UserNavBar = () => {
     const router = useRouter();
     const { logout } = useContext(LoggedUserContext);
     const { SubMenu } = Menu;
+    const [name, setName] = useState<string>('');
 
     const handleLogout = useCallback(() => {
         logout();
         router.push('/login');
     }, [logout, router]);
 
+    async function fetchUsername() {
+        let usr = (await userController.usersMeGet()).data.name;
+        setName(usr ? usr : '');
+    }
+
+    useEffect(() => {
+        fetchUsername();
+    }, []);
+
     return (
         <Menu theme="dark" mode="horizontal">
             <Menu.Item key="1" onClick={() => router.push('/documents/annotator')}>
                 <FontAwesomeIcon icon={faFileLines} /> Dokumenty
             </Menu.Item>
 
-            <SubMenu
-                key="account"
-                icon={<FontAwesomeIcon icon={faUser} />}
-                title={'Anotátor XY'} // TODO show username
-            >
+            <SubMenu key="account" icon={<FontAwesomeIcon icon={faUser} />} title={name}>
                 <Menu.Item key="setting:2" onClick={() => handleLogout()}>
                     Odhlásit se
                 </Menu.Item>