Close the modal when its form has succeeded

webui-src/app/boards/board_view.js

@@ -4,6 +4,7 @@ const boardKanban = require('boards/board_kanban');
 const rs = require('rswebui');
 const peopleUtil = require('people/people_util');
 const icon = require('icon');
+const widget = require('widgets');
 const { CommentsSection } = require('comments');
 const toast = require('toast');
 const Data = util.Data;
@@ -119,6 +120,7 @@ function createboard() {
                 }),
               });
               if (res.body.retval && vnode.attrs.onCreated) await vnode.attrs.onCreated();
+              if (res.body.retval) widget.closePopupMessage();
               res.body.retval
                 ? toast.success('Board created successfully')
                 : toast.error(res.body.errorMessage || 'Error in creating Board');
@@ -263,6 +265,7 @@ function CreatePost() {
             if (res.body.retval) {
               Data.Posts[vnode.attrs.boardId] = {};
               await util.updateDisplayBoards(vnode.attrs.boardId);
+              widget.closePopupMessage();
               toast.success('Post created successfully');
             } else {
               toast.error(res.body.error_message || res.body.errorMessage || 'The post could not be created');

webui-src/app/channels/channel_view.js

@@ -264,6 +264,9 @@ function createchannel() {
               if (res.body.retval) {
                 await util.updatedisplaychannels(res.body.channelId, undefined, false);
                 if (vnode.attrs.onCreated) await vnode.attrs.onCreated();
+                //  The form is done: close it before the toast, or a second
+                //  click would create the channel again.
+                widget.closePopupMessage();
                 m.redraw();
               }
               res.body.retval === false
@@ -409,9 +412,12 @@ const AddPost = () => {
                   files: pfiles, // does not work for now
                   thumbnail: { mData: { base64: pthumbnail } },
                 });
-                res.body.retval === false
-                  ? toast.error(res.body.errorMessage)
-                  : toast.success('Post added successfully');
+                if (res.body.retval === false) {
+                  toast.error(res.body.errorMessage);
+                } else {
+                  widget.closePopupMessage();
+                  toast.success('Post added successfully');
+                }
                 util.updatedisplaychannels(vnode.attrs.chanId);
                 m.redraw();
               }

webui-src/app/files/files_downloads.js

@@ -109,7 +109,8 @@ function addFile(url) {
       },
     },
     (status) => {
-      toast.info('Successfully added file!');
+      widget.closePopupMessage();
+      toast.success('Successfully added file!');
     }
   );
 }

webui-src/app/files/files_manager.js

@@ -63,6 +63,7 @@ const AddSharedDirForm = () => {
     rs.rsJsonApiRequest('/rsFiles/addSharedDirectory', { ...newSharedDir }).then((res) => {
       if (res.body.retval) {
         loadSharedDirectories();
+        widget.closePopupMessage();
       }
       toast.result(res.body.retval,
         'Directory shared',

webui-src/app/forums/forum_view.js

@@ -144,6 +144,7 @@ function createforum() {
               if (res.body.retval) {
                 await util.updatedisplayforums(res.body.forumId);
                 if (vnode.attrs.onCreated) await vnode.attrs.onCreated();
+                widget.closePopupMessage();
                 m.redraw();
               }
               res.body.retval === false
@@ -473,9 +474,12 @@ const AddThread = () => {
                     authorId: identity,
                   });
 
-              res.body.retval === false
-                ? toast.error(res.body.errorMessage)
-                : toast.success('Thread added successfully');
+              if (res.body.retval === false) {
+                toast.error(res.body.errorMessage);
+              } else {
+                widget.closePopupMessage();
+                toast.success(vnode.attrs.parent_thread !== '' ? 'Reply added successfully' : 'Thread added successfully');
+              }
               util.updatedisplayforums(vnode.attrs.forumId);
               m.redraw();
             },

webui-src/app/home.js

@@ -199,6 +199,7 @@ function confirmAddPrompt(details, cert, long) {
             if (res.body.retval) {
               NetworkData.rememberPendingFriend(details);
               await refreshFriendLists(details.gpg_id || details.pgpId);
+              widget.closePopupMessage();
               toast.success('Successfully added friend.');
             } else {
               toast.error('An error occoured during adding. Friend not added.');
@@ -216,6 +217,7 @@ function confirmAddPrompt(details, cert, long) {
             if (res.body.retval) {
               NetworkData.rememberPendingFriend(details);
               await refreshFriendLists(details.gpg_id || details.pgpId);
+              widget.closePopupMessage();
               toast.success('Successfully added friend.');
             } else {
               toast.error('An error occoured during adding. Friend not added.');

webui-src/app/main.js

@@ -2,7 +2,7 @@ const m = require('mithril');
 
 //  Bumped at every change of the web UI; shown in the rail, the phone header
 //  and the Debug page.
-const WEBUI_VERSION = 'v176';
+const WEBUI_VERSION = 'v177';
 
 const login = require('login');
 const rs = require('rswebui');

webui-src/app/people/people_ownids.js

@@ -25,7 +25,10 @@ const SignedIdentity = () => {
         //  Cleared here, not only in .catch(): a refused passphrase is a
         //  valid answer, and the button would otherwise stay on "Creating…".
         submitting = false;
-        if (data && data.retval) await peopleUtil.refreshOwnIds(previousIds);
+        if (data && data.retval) {
+          await peopleUtil.refreshOwnIds(previousIds);
+          widget.closePopupMessage();
+        }
         const message = data && data.retval
           ? 'Successfully created identity.'
           : 'Could not create the identity. Check your profile password and try again.';
@@ -145,7 +148,10 @@ const CreateIdentity = () => {
                   pseudonimous,
                 },
                 async (data) => {
-                  if (data.retval) await peopleUtil.refreshOwnIds();
+                  if (data.retval) {
+                    await peopleUtil.refreshOwnIds();
+                    widget.closePopupMessage();
+                  }
                   const message = data.retval
                     ? 'Successfully created identity.'
                     : 'An error occured while creating identity.';
@@ -195,6 +201,7 @@ const SignedEditIdentity = () => {
                 pgpPassword: passphrase,
               },
               (data) => {
+                if (data && data.retval) widget.closePopupMessage();
                 const message = data && data.retval
                   ? 'Identity updated.'
                   : 'Could not update the identity. Check your profile password and try again.';
@@ -291,6 +298,7 @@ const EditIdentity = () => {
                     pseudonimous: true,
                   },
                   (data) => {
+                    if (data && data.retval) widget.closePopupMessage();
                     const message = data && data.retval
                       ? 'Identity updated.'
                       : 'Could not update the identity.';