ivabus/gui
1
0
Fork 0
mirror of https://github.com/ivabus/gui synced 2025-04-23 14:07:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfixes (#610)

Browse source 
* prevent e2e from registering device to pushy

* #602 fix prune count

* #609 show which version is being installed


---------

Co-authored-by: neil molina <neil@neils-MacBook-Pro.local>
This commit is contained in:
Neil 2023-05-15 11:31:18 +08:00 committed by GitHub
parent 24ff5f23ee
commit ce05f68e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/desktop/electron/libs/push-notification.ts
View file

@ -21,7 +21,7 @@ const readFile = promisify(fs.readFile);
const writeFile = promisify(fs.writeFile); const writeFile = promisify(fs.writeFile);
export default function initialize(mainWindow: BrowserWindow) { export default function initialize(mainWindow: BrowserWindow) {
if (config.PUSHY_APP_ID) { if (config.PUSHY_APP_ID && process.env.NODE_ENV !== "test") {
Pushy.listen(); Pushy.listen();
// Register device for push notifications // Register device for push notifications
Pushy.register({ appId: config.PUSHY_APP_ID }) Pushy.register({ appId: config.PUSHY_APP_ID })

2
modules/desktop/package.json
View file

@ -29,7 +29,7 @@
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --compiler-warnings \"css-unused-selector:ignore\" --watch", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --compiler-warnings \"css-unused-selector:ignore\" --watch",
"lint": "prettier --check . && eslint .", "lint": "prettier --check . && eslint .",
"format": "prettier --write .", "format": "prettier --write .",
"e2e": "wdio run ./wdio.conf.ts" "e2e": "NODE_ENV=test wdio run ./wdio.conf.ts"
}, },
"devDependencies": { "devDependencies": {
"@electron/notarize": "^1.2.3", "@electron/notarize": "^1.2.3",

2
modules/desktop/src/components/package-banner/package-banner.svelte
View file

@ -159,7 +159,7 @@
</div> </div>
</Button> </Button>
<div slot="tooltip-content" class="flex flex-col items-center"> <div slot="tooltip-content" class="flex flex-col items-center">
<div>Removes {pkg.installed_versions?.length ?? 0 - 1} old versions</div> <div>Removes {(pkg.installed_versions?.length || 0) - 1} old versions</div>
<div>Keeps latest (v{findRecentInstalledVersion(pkg)})</div> <div>Keeps latest (v{findRecentInstalledVersion(pkg)})</div>
</div> </div>
</ToolTip> </ToolTip>

3
modules/desktop/src/components/package-install-button/package-install-button.svelte
View file

@ -6,6 +6,8 @@
export let buttonSize: "small" | "large" = "small"; export let buttonSize: "small" | "large" = "small";
export let pkg: GUIPackage; export let pkg: GUIPackage;
export let activeVersion = ""; // determine which version is being installed
export let onClick = (evt?: MouseEvent) => { export let onClick = (evt?: MouseEvent) => {
console.log("do nothing"); console.log("do nothing");
}; };
@ -25,6 +27,7 @@
}; };
const getVersion = (pkg: GUIPackage) => { const getVersion = (pkg: GUIPackage) => {
if (pkg.state === PackageStates.INSTALLING && activeVersion) return activeVersion;
if (pkg.state === PackageStates.INSTALLED) { if (pkg.state === PackageStates.INSTALLED) {
return pkg.installed_versions?.[0] ?? pkg.version; return pkg.installed_versions?.[0] ?? pkg.version;
} }

4
modules/desktop/src/components/package-install-button/package-version-selector.svelte
View file

@ -30,6 +30,7 @@
(a: string, b: string) => semverCompare(b, a) (a: string, b: string) => semverCompare(b, a)
); );
let activeVersion = "";
const handleClick = (evt: MouseEvent, version: string) => { const handleClick = (evt: MouseEvent, version: string) => {
if (isInstalled(version)) { if (isInstalled(version)) {
return; return;
@ -37,6 +38,7 @@
isOpened = false; isOpened = false;
if (version) { if (version) {
activeVersion = version;
onClick(version); onClick(version);
} }
}; };
@ -45,7 +47,7 @@
</script> </script>
<div class="dropdown z-10" use:clickOutside on:click_outside={handleClickOutside}> <div class="dropdown z-10" use:clickOutside on:click_outside={handleClickOutside}>
<PackageStateButton {buttonSize} {pkg} onClick={toggleOpen}> <PackageStateButton {buttonSize} {pkg} onClick={toggleOpen} {activeVersion}>
<div slot="selector" class="pt-2"> <div slot="selector" class="pt-2">
<div class="version-list" class:visible={isOpened}> <div class="version-list" class:visible={isOpened}>
{#each allVersions as version, idx} {#each allVersions as version, idx}