Merge pull request #3173 from ceruleandeep/redesign-extension-manager Redesign extension manager

003d17b2c5ee9379d7e62805f377eca7c798c85d

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

.gitignore+2 -0 Viewed

 /default/scaffold
 public/scripts/extensions/third-party
 /certs
 +.aider*
 +.env

public/scripts/extensions.js+13 -3 Viewed

 /**
  * Handles the click event for the update button of an extension.
  * This function makes a POST request to '/update_extensionapi/extensions/update' with the extension's name.
  * If the extension is already up to date, it displays a success message.
  * If the extension is not up to date, it updates the extension and displays a success message with the new commit hash.
  */

@@ -783,8 +783,11 @@ async function onUpdateClick() {
783	783	return;
784	784	}
785	785
786	786	const icon = $(this).find('i').addClass('fa-spin');
	787	+ icon.addClass('fa-spin');
787	788	await updateExtension(extensionName, false);
	789	+ // updateExtension eats the error, but we can at least stop the spinner
	790	+ icon.removeClass('fa-spin');
788	791	}
789	792
790	793	/**

             }),
         });
 +        if (!response.ok) {
 +            const text = await response.text();
 +            toastr.error(text || response.statusText, t`Extension update failed`, { timeOut: 5000 });
 +            console.error('Extension update failed', response.status, response.statusText, text);
 +            return;
 +        }
++
         const data = await response.json();
         if (!quiet) {
             await showExtensionsDetails();
+        }
         if (data.isUpToDate) {

src/endpoints/extensions.js+10 -2 Viewed

             return response.status(404).send(`Directory does not exist at ${extensionPath}`);
+        }
 +        let currentCommitHash;
 +        try {
 +            currentCommitHash = await git.cwd(extensionPath).revparse(['HEAD']);
 +        } catch (error) {
 +            // it is not a git repo, or has no commits yet, or is a bare repo
 +            // not possible to update it, most likely can't get the branch name either
 +            return response.send({ currentBranchName: null, currentCommitHash, isUpToDate: true, remoteUrl: null });
 +        }
++
         const currentBranch = await git.cwd(extensionPath).branch();
         // get only the working branch
         const currentBranchName = currentBranch.current;
         await git.cwd(extensionPath).fetch('origin');
 -        const currentCommitHash = await git.cwd(extensionPath).revparse(['HEAD']);
 +        console.log(extensionName, currentBranchName, currentCommitHash);
 -        console.log(currentBranch, currentCommitHash);
         const { isUpToDate, remoteUrl } = await checkIfRepoIsUpToDate(extensionPath);
         return response.send({ currentBranchName, currentCommitHash, isUpToDate, remoteUrl });