Removed token before login, fixed dump submenu (adjustment), fixed ca…

…se when empty models list displayed
cvat-ai · Nov 27, 2019 · 0d92d33 · 0d92d33
1 parent abf7251
commit 0d92d33
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/cvat-core/src/server-proxy.js b/cvat-core/src/server-proxy.js
@@ -147,6 +147,7 @@
                     `${encodeURIComponent('password')}=${encodeURIComponent(password)}`,
                 ]).join('&').replace(/%20/g, '+');
 
+                Axios.defaults.headers.common.Authorization = '';
                 let authenticationResponse = null;
                 try {
                     authenticationResponse = await Axios.post(

diff --git a/cvat-ui/src/components/models-page/models-page.tsx b/cvat-ui/src/components/models-page/models-page.tsx
@@ -35,15 +35,18 @@ export default function ModelsPageComponent(props: Props) {
         return (
             <div className='cvat-models-page'>
                 <TopBarComponent installedAutoAnnotation={props.installedAutoAnnotation}/>
-                { integratedModels.length ?
-                    <BuiltModelsList models={integratedModels}/> : null }
-                { uploadedModels.length &&
+                { !!integratedModels.length &&
+                    <BuiltModelsList models={integratedModels}/>
+                }
+                { !!uploadedModels.length &&
                     <UploadedModelsList
                         registeredUsers={props.registeredUsers}
                         models={uploadedModels}
                         deleteModel={props.deleteModel}
                     />
-                } { props.installedAutoAnnotation &&
+                }
+                { props.installedAutoAnnotation &&
+                    !uploadedModels.length &&
                     !props.installedTFAnnotation &&
                     !props.installedTFSegmentation &&
                     <EmptyListComponent/>

diff --git a/cvat-ui/src/stylesheet.css b/cvat-ui/src/stylesheet.css
@@ -316,6 +316,10 @@
     background-color: rgba(24,144,255,0.05);
 }
 
+.cvat-actions-menu-dump-submenu-item > button {
+    text-align: start;
+}
+
 .cvat-actions-menu-dump-submenu-item:hover {
     background-color: rgba(24,144,255,0.05);
 }