refactor: replace not notEmptyString by isEmptyString (#1087)

Signed-off-by: David Dal Busco <[email protected]>
junobuild · Jan 15, 2025 · 17bc38c · 17bc38c
1 parent a2c398b
commit 17bc38c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/src/frontend/src/lib/components/core/Navmenu.svelte b/src/frontend/src/lib/components/core/Navmenu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { notEmptyString } from '@dfinity/utils';
+	import { isEmptyString } from '@dfinity/utils';
 	import { circOut, quintOut } from 'svelte/easing';
 	import { slide } from 'svelte/transition';
 	import { page } from '$app/state';
@@ -42,7 +42,7 @@
 
 <Menu>
 	<nav>
-		{#if !notEmptyString(satelliteId)}
+		{#if isEmptyString(satelliteId)}
 			<a class="link" href="/">
 				<IconRocket size="24px" />
 				<span>{$i18n.satellites.launchpad}</span>

diff --git a/src/frontend/src/lib/components/docs/DocUpload.svelte b/src/frontend/src/lib/components/docs/DocUpload.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Principal } from '@dfinity/principal';
-	import { isNullish, nonNullish, notEmptyString } from '@dfinity/utils';
+	import { isEmptyString, isNullish, nonNullish, notEmptyString } from '@dfinity/utils';
 	import { setDoc } from '@junobuild/core';
 	import { nanoid } from 'nanoid';
 	import { createEventDispatcher, getContext, type Snippet } from 'svelte';
@@ -65,7 +65,7 @@
 			return;
 		}
 
-		if (isNullish(key) || !notEmptyString(key)) {
+		if (isNullish(key) || isEmptyString(key)) {
 			// Upload is disabled if not valid
 			toasts.error({
 				text: $i18n.errors.key_invalid
@@ -126,7 +126,7 @@
 
 <DataUpload
 	on:junoUpload={upload}
-	disabled={!notEmptyString(key)}
+	disabled={isEmptyString(key)}
 	{action}
 	{title}
 	description={descriptionSnippet}

diff --git a/src/frontend/src/lib/components/hosting/AddCustomDomainForm.svelte b/src/frontend/src/lib/components/hosting/AddCustomDomainForm.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { isNullish, notEmptyString } from '@dfinity/utils';
+	import { isEmptyString, isNullish } from '@dfinity/utils';
 	import { createEventDispatcher } from 'svelte';
 	import { preventDefault } from 'svelte/legacy';
 	import type { Satellite } from '$declarations/mission_control/mission_control.did';
@@ -19,7 +19,7 @@
 	const dispatch = createEventDispatcher();
 
 	const onSubmitDomainName = () => {
-		if (isNullish(domainNameInput) || !notEmptyString(domainNameInput)) {
+		if (isNullish(domainNameInput) || isEmptyString(domainNameInput)) {
 			toasts.error({
 				text: $i18n.errors.hosting_missing_domain_name
 			});

diff --git a/src/frontend/src/lib/components/modals/CustomDomainModal.svelte b/src/frontend/src/lib/components/modals/CustomDomainModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { isNullish, nonNullish, notEmptyString } from '@dfinity/utils';
+	import { isEmptyString, isNullish, nonNullish } from '@dfinity/utils';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import type { AuthenticationConfig } from '$declarations/satellite/satellite.did';
 	import { setAuthConfig } from '$lib/api/satellites.api';
@@ -37,7 +37,7 @@
 	onMount(() => {
 		domainNameInput = (detail as JunoModalCustomDomainDetail).editDomainName ?? '';
 
-		if (!notEmptyString(domainNameInput)) {
+		if (isEmptyString(domainNameInput)) {
 			return;
 		}
 

diff --git a/src/frontend/src/lib/components/monitoring/MonitoringSelectedModules.svelte b/src/frontend/src/lib/components/monitoring/MonitoringSelectedModules.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Principal } from '@dfinity/principal';
-	import { notEmptyString } from '@dfinity/utils';
+	import { isEmptyString } from '@dfinity/utils';
 	import type { Orbiter, Satellite } from '$declarations/mission_control/mission_control.did';
 	import Segment from '$lib/components/segments/Segment.svelte';
 	import Value from '$lib/components/ui/Value.svelte';
@@ -35,7 +35,7 @@
 
 			<li>
 				<Segment id={orbiterId}>
-					{!notEmptyString(orbName) ? $i18n.analytics.title : orbName}
+					{isEmptyString(orbName) ? $i18n.analytics.title : orbName}
 				</Segment>
 			</li>
 		{/each}

diff --git a/src/frontend/src/lib/components/segments/SegmentsTable.svelte b/src/frontend/src/lib/components/segments/SegmentsTable.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Principal } from '@dfinity/principal';
-	import { nonNullish, notEmptyString } from '@dfinity/utils';
+	import { isEmptyString, nonNullish } from '@dfinity/utils';
 	import { onMount, type Snippet, untrack } from 'svelte';
 	import type { Orbiter, Satellite } from '$declarations/mission_control/mission_control.did';
 	import Segment from '$lib/components/segments/Segment.svelte';
@@ -139,7 +139,7 @@
 					>
 					<td>
 						<Segment id={orbiter[0]}>
-							{!notEmptyString(orbName) ? $i18n.analytics.title : orbName}
+							{isEmptyString(orbName) ? $i18n.analytics.title : orbName}
 						</Segment>
 					</td>
 				</tr>

diff --git a/src/frontend/src/lib/services/mission-control.services.ts b/src/frontend/src/lib/services/mission-control.services.ts
@@ -47,7 +47,7 @@ import type { Option } from '$lib/types/utils';
 import { isNotValidEmail } from '$lib/utils/email.utils';
 import type { Identity } from '@dfinity/agent';
 import type { Principal } from '@dfinity/principal';
-import { fromNullable, isNullish, notEmptyString } from '@dfinity/utils';
+import { fromNullable, isEmptyString, isNullish } from '@dfinity/utils';
 import { compare } from 'semver';
 import { get } from 'svelte/store';
 
@@ -324,7 +324,7 @@ export const setMetadataEmail = async ({
 	email: string;
 	metadata: Metadata;
 }): Promise<{ success: boolean }> => {
-	if (!notEmptyString(email) || isNotValidEmail(email)) {
+	if (isEmptyString(email) || isNotValidEmail(email)) {
 		toasts.error({
 			text: get(i18n).errors.invalid_email
 		});

diff --git a/src/frontend/src/lib/services/monitoring.services.ts b/src/frontend/src/lib/services/monitoring.services.ts
@@ -39,6 +39,7 @@ import { emit } from '$lib/utils/events.utils';
 import type { Principal } from '@dfinity/principal';
 import {
 	assertNonNullish,
+	isEmptyString,
 	isNullish,
 	nonNullish,
 	notEmptyString,
@@ -301,7 +302,7 @@ const setEmail = async ({
 		Omit<ApplyMonitoringCyclesStrategyOptions, 'saveAsDefaultStrategy' | 'monitoringConfig'>
 	>) => {
 	// Do nothing if no email is provided
-	if (isNullish(userEmail) || !notEmptyString(userEmail)) {
+	if (isNullish(userEmail) || isEmptyString(userEmail)) {
 		return;
 	}