fix multiple UI bugs, closes #2616

src/becca/entities/etapi_token.js

@@ -42,8 +42,10 @@ class EtapiToken extends AbstractEntity {
         /** @type {boolean} */
         this.isDeleted = !!row.isDeleted;
 
+        if (this.etapiTokenId) {
             this.becca.etapiTokens[this.etapiTokenId] = this;
         }
+    }
 
     init() {
         if (this.etapiTokenId) {

src/public/app/dialogs/options/etapi.js

@@ -62,12 +62,12 @@ export default class EtapiOptions {
                 return;
             }
 
-            const {token} = await server.post('etapi-tokens', {tokenName});
+            const {authToken} = await server.post('etapi-tokens', {tokenName});
 
             await promptDialog.ask({
                 title: "ETAPI token created",
                 message: 'Copy the created token into clipboard. Trilium stores the token hashed and this is the last time you see it.',
-                defaultValue: token 
+                defaultValue: authToken
             });
 
             this.refreshTokens();

src/public/app/dialogs/prompt.js

@@ -51,7 +51,8 @@ $dialog.on("hidden.bs.modal", () => {
     }
 });
 
-$form.on('submit', () => {
+$form.on('submit', e => {
+    e.preventDefault();
     resolve($answer.val());
 
     $dialog.modal('hide');

src/routes/api/etapi_tokens.js

@@ -9,9 +9,7 @@ function getTokens() {
 }
 
 function createToken(req) {
-    return {
+    return etapiTokenService.createToken(req.body.tokenName);
-        authToken: etapiTokenService.createToken(req.body.tokenName)
-    };
 }
 
 function patchToken(req) {

src/services/etapi_tokens.js

@@ -93,8 +93,7 @@ function deleteToken(etapiTokenId) {
         return; // ok, already deleted
     }
 
-    etapiToken.isDeleted = true;
+    etapiToken.markAsDeletedSimple();
-    etapiToken.save();
 }
 
 module.exports = {

src/views/dialogs/prompt.ejs

@@ -1,5 +1,5 @@
 <div id="prompt-dialog" class="modal mx-auto" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <form id="prompt-dialog-form">
                 <div class="modal-header">