Skip to content

Commit

Permalink
Merge branch 'main' into build/pic-js
Browse files Browse the repository at this point in the history
  • Loading branch information
peterpeterparker authored Jan 20, 2025
2 parents cb717c8 + a8e532a commit b60f334
Show file tree
Hide file tree
Showing 30 changed files with 396 additions and 1,804 deletions.
2,102 changes: 356 additions & 1,746 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"dev": "npm run i18n && vite dev",
"build": "npm run build:frontend",
"build:frontend": "tsc --noEmit && vite build && npm run build:post-process",
"prepare": "svelte-kit sync",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --no-tsconfig",
"check:watch": "svelte-kit sync && svelte-check --no-tsconfig --watch",
Expand Down Expand Up @@ -82,20 +83,20 @@
"tslib": "^2.8.1",
"typescript": "^5.7.3",
"vite": "^6.0.9",
"vitest": "^2.1.8"
"vitest": "^3.0.2"
},
"dependencies": {
"@dfinity/agent": "^2.1.3",
"@dfinity/auth-client": "^2.1.3",
"@dfinity/candid": "^2.1.3",
"@dfinity/cmc": "^4.1.0",
"@dfinity/ic-management": "^6.0.2",
"@dfinity/cmc": "^4.1.1",
"@dfinity/ic-management": "^6.0.3",
"@dfinity/identity": "^2.1.3",
"@dfinity/ledger-icp": "^2.6.6",
"@dfinity/ledger-icrc": "^2.7.1",
"@dfinity/ledger-icp": "^2.6.7",
"@dfinity/ledger-icrc": "^2.7.2",
"@dfinity/oisy-wallet-signer": "^0.1.3",
"@dfinity/principal": "^2.1.3",
"@dfinity/utils": "^2.8.0",
"@dfinity/utils": "^2.9.0",
"@dfinity/zod-schemas": "^0.0.1",
"@junobuild/admin": "^0.1.1",
"@junobuild/core": "^0.1.0",
Expand Down
3 changes: 1 addition & 2 deletions src/frontend/src/lib/components/assets/Asset.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { Principal } from '@dfinity/principal';
import { fromNullable, isNullish, nonNullish } from '@dfinity/utils';
import { fromNullable, isNullish, nonNullish, fromNullishNullable } from '@dfinity/utils';
import { getContext } from 'svelte';
import type { AssetNoContent } from '$declarations/satellite/satellite.did';
import { deleteAsset } from '$lib/api/satellites.api';
Expand All @@ -17,7 +17,6 @@
import { PAGINATION_CONTEXT_KEY, type PaginationContext } from '$lib/types/pagination.context';
import { RULES_CONTEXT_KEY, type RulesContext } from '$lib/types/rules.context';
import { formatToDate } from '$lib/utils/date.utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { satelliteUrl } from '$lib/utils/satellite.utils';
const { store, resetData }: DataContext<AssetNoContent> =
Expand Down
3 changes: 1 addition & 2 deletions src/frontend/src/lib/components/auth/AuthConfig.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { isNullish, nonNullish } from '@dfinity/utils';
import { isNullish, nonNullish, fromNullishNullable } from '@dfinity/utils';
import { fade } from 'svelte/transition';
import type { Satellite } from '$declarations/mission_control/mission_control.did';
import type { AuthenticationConfig, Rule } from '$declarations/satellite/satellite.did';
Expand All @@ -10,7 +10,6 @@
import { authStore } from '$lib/stores/auth.store';
import { busy } from '$lib/stores/busy.store';
import { i18n } from '$lib/stores/i18n.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { emit } from '$lib/utils/events.utils';
interface Props {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { nonNullish } from '@dfinity/utils';
import { nonNullish, fromNullishNullable } from '@dfinity/utils';
import { onMount, untrack } from 'svelte';
import type { CyclesMonitoringStrategy } from '$declarations/mission_control/mission_control.did';
import MonitoringSentence from '$lib/components/modals/MonitoringSentence.svelte';
Expand All @@ -8,7 +8,6 @@
import { BASIC_STRATEGY } from '$lib/constants/monitoring.constants';
import { i18n } from '$lib/stores/i18n.store';
import type { JunoModalCreateSegmentDetail, JunoModalDetail } from '$lib/types/modal';
import { fromNullishNullable } from '$lib/utils/did.utils';
interface Props {
detail: JunoModalDetail;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { fromNullable, isNullish, nonNullish } from '@dfinity/utils';
import { fromNullable, isNullish, nonNullish, fromNullishNullable } from '@dfinity/utils';
import { type SvelteComponent, createEventDispatcher, getContext } from 'svelte';
import { preventDefault } from 'svelte/legacy';
import type { RateConfig, Rule, RulesType } from '$declarations/satellite/satellite.did';
Expand All @@ -21,7 +21,6 @@
import { i18n } from '$lib/stores/i18n.store';
import { toasts } from '$lib/stores/toasts.store';
import { RULES_CONTEXT_KEY, type RulesContext } from '$lib/types/rules.context';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { i18nFormat } from '$lib/utils/i18n.utils';
import { memoryToText, permissionToText } from '$lib/utils/rules.utils';
Expand Down
3 changes: 1 addition & 2 deletions src/frontend/src/lib/components/docs/Doc.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { Principal } from '@dfinity/principal';
import { fromNullable, nonNullish } from '@dfinity/utils';
import { fromNullable, nonNullish, fromNullishNullable } from '@dfinity/utils';
import { fromArray } from '@junobuild/utils';
import { getContext } from 'svelte';
import { run } from 'svelte/legacy';
Expand All @@ -11,7 +11,6 @@
import { i18n } from '$lib/stores/i18n.store';
import { DATA_CONTEXT_KEY, type DataContext } from '$lib/types/data.context';
import { formatToDate } from '$lib/utils/date.utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
const { store }: DataContext<Doc> = getContext<DataContext<Doc>>(DATA_CONTEXT_KEY);
Expand Down
9 changes: 7 additions & 2 deletions src/frontend/src/lib/components/docs/DocUpload.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<script lang="ts">
import type { Principal } from '@dfinity/principal';
import { isEmptyString, isNullish, nonNullish, notEmptyString } from '@dfinity/utils';
import {
isEmptyString,
isNullish,
nonNullish,
notEmptyString,
fromNullishNullable
} from '@dfinity/utils';
import { setDoc } from '@junobuild/core';
import { nanoid } from 'nanoid';
import { createEventDispatcher, getContext, type Snippet } from 'svelte';
Expand All @@ -14,7 +20,6 @@
import { i18n } from '$lib/stores/i18n.store';
import { toasts } from '$lib/stores/toasts.store';
import { RULES_CONTEXT_KEY, type RulesContext } from '$lib/types/rules.context';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { fileToDocData } from '$lib/utils/doc.utils';
import { container } from '$lib/utils/juno.utils';
Expand Down
3 changes: 1 addition & 2 deletions src/frontend/src/lib/components/hosting/CustomDomain.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { isNullish, nonNullish } from '@dfinity/utils';
import { isNullish, nonNullish, fromNullishNullable } from '@dfinity/utils';
import { createEventDispatcher, onDestroy, onMount } from 'svelte';
import { run } from 'svelte/legacy';
import type { Satellite } from '$declarations/mission_control/mission_control.did';
Expand All @@ -17,7 +17,6 @@
import type { CustomDomainRegistrationState } from '$lib/types/custom-domain';
import type { PostMessageDataResponseHosting } from '$lib/types/post-message';
import type { Option } from '$lib/types/utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { emit } from '$lib/utils/events.utils';
import { keyOf } from '$lib/utils/utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { isNullish, nonNullish } from '@dfinity/utils';
import { isNullish, nonNullish, fromNullishNullable } from '@dfinity/utils';
import { run, stopPropagation } from 'svelte/legacy';
import type { Satellite } from '$declarations/mission_control/mission_control.did';
import type {
Expand All @@ -20,7 +20,6 @@
import type { JunoModalCustomDomainDetail } from '$lib/types/modal';
import type { Option } from '$lib/types/utils';
import { buildDeleteAuthenticationConfig } from '$lib/utils/auth.config.utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { emit } from '$lib/utils/events.utils';
import { i18nFormat } from '$lib/utils/i18n.utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { nonNullish } from '@dfinity/utils';
import { nonNullish, fromNullishNullable } from '@dfinity/utils';
import { createEventDispatcher } from 'svelte';
import { run, stopPropagation } from 'svelte/legacy';
import { fade } from 'svelte/transition';
Expand All @@ -11,7 +11,6 @@
import { i18n } from '$lib/stores/i18n.store';
import type { CustomDomainRegistrationState } from '$lib/types/custom-domain';
import type { Option } from '$lib/types/utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { keyOf } from '$lib/utils/utils';
interface Props {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { fromNullable, nonNullish, isNullish } from '@dfinity/utils';
import { fromNullable, nonNullish, isNullish, fromNullishNullable } from '@dfinity/utils';
import { fade } from 'svelte/transition';
import type { Satellite } from '$declarations/mission_control/mission_control.did';
import type { AuthenticationConfig, Rule } from '$declarations/satellite/satellite.did';
Expand All @@ -14,7 +14,6 @@
import { isBusy, wizardBusy } from '$lib/stores/busy.store';
import { i18n } from '$lib/stores/i18n.store';
import type { JunoModalDetail, JunoModalEditAuthConfigDetail } from '$lib/types/modal';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { emit } from '$lib/utils/events.utils';
import { satelliteUrl as satelliteUrlUtils } from '$lib/utils/satellite.utils';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { Principal } from '@dfinity/principal';
import { nonNullish, notEmptyString } from '@dfinity/utils';
import { nonNullish, notEmptyString, fromNullishNullable } from '@dfinity/utils';
import type {
CyclesMonitoringStrategy,
Orbiter,
Expand All @@ -25,7 +25,6 @@
import type { JunoModalDetail, JunoModalCreateMonitoringStrategyDetail } from '$lib/types/modal';
import type { MonitoringStrategyProgress } from '$lib/types/progress-strategy';
import type { Option } from '$lib/types/utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { metadataEmail } from '$lib/utils/metadata.utils';
interface Props {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { isEmptyString, isNullish, nonNullish } from '@dfinity/utils';
import { isEmptyString, isNullish, nonNullish, fromNullishNullable } from '@dfinity/utils';
import { createEventDispatcher, onMount } from 'svelte';
import type { AuthenticationConfig } from '$declarations/satellite/satellite.did';
import { setAuthConfig } from '$lib/api/satellites.api';
Expand All @@ -17,7 +17,6 @@
import type { CustomDomainDns } from '$lib/types/custom-domain';
import type { JunoModalCustomDomainDetail, JunoModalDetail } from '$lib/types/modal';
import { toCustomDomainDns } from '$lib/utils/custom-domain.utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { emit } from '$lib/utils/events.utils';
interface Props {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script lang="ts">
import type { Principal } from '@dfinity/principal';
import { fromNullishNullable } from '@dfinity/utils';
import type {
CyclesMonitoringStrategy,
Orbiter,
Expand All @@ -16,7 +17,6 @@
import { i18n } from '$lib/stores/i18n.store';
import type { JunoModalDetail, JunoModalCreateMonitoringStrategyDetail } from '$lib/types/modal';
import type { MonitoringStrategyProgress } from '$lib/types/progress-strategy';
import { fromNullishNullable } from '$lib/utils/did.utils';
interface Props {
detail: JunoModalDetail;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { Principal } from '@dfinity/principal';
import { nonNullish } from '@dfinity/utils';
import { nonNullish, fromNullishNullable } from '@dfinity/utils';
import type { Snippet } from 'svelte';
import { fade } from 'svelte/transition';
import type { Monitoring } from '$declarations/mission_control/mission_control.did';
Expand All @@ -13,7 +13,6 @@
import type { CanisterData, CanisterMonitoringData, Segment } from '$lib/types/canister';
import { formatTCycles } from '$lib/utils/cycles.utils';
import { formatToRelativeTime } from '$lib/utils/date.utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { emit } from '$lib/utils/events.utils';
interface Props {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { fromNullable } from '@dfinity/utils';
import { fromNullable, fromNullishNullable } from '@dfinity/utils';
import { fade } from 'svelte/transition';
import IconAnalytics from '$lib/components/icons/IconAnalytics.svelte';
import IconMissionControl from '$lib/components/icons/IconMissionControl.svelte';
Expand All @@ -16,7 +16,6 @@
import { satellitesStore } from '$lib/derived/satellite.derived';
import { i18n } from '$lib/stores/i18n.store';
import type { MissionControlId } from '$lib/types/mission-control';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { satelliteName } from '$lib/utils/satellite.utils';
interface Props {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { nonNullish } from '@dfinity/utils';
import { nonNullish, fromNullishNullable } from '@dfinity/utils';
import { fade } from 'svelte/transition';
import MonitoringSentence from '$lib/components/modals/MonitoringSentence.svelte';
import Value from '$lib/components/ui/Value.svelte';
Expand All @@ -8,7 +8,6 @@
missionControlUserDataLoaded
} from '$lib/derived/mission-control-user.derived';
import { i18n } from '$lib/stores/i18n.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
let monitoringStrategy = $derived(
fromNullishNullable(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts">
import { fromNullishNullable } from '@dfinity/utils';
import { fade } from 'svelte/transition';
import type { Monitoring } from '$declarations/mission_control/mission_control.did';
import Value from '$lib/components/ui/Value.svelte';
import { i18n } from '$lib/stores/i18n.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
interface Props {
monitoring: Monitoring | undefined;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { debounce } from '@dfinity/utils';
import { debounce, fromNullishNullable } from '@dfinity/utils';
import { onMount } from 'svelte';
import { fade } from 'svelte/transition';
import Toggle from '$lib/components/ui/Toggle.svelte';
Expand All @@ -11,7 +11,6 @@
import { authStore } from '$lib/stores/auth.store';
import { busy } from '$lib/stores/busy.store';
import { i18n } from '$lib/stores/i18n.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
let enabled = $state(false);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<script lang="ts">
import { nonNullish } from '@dfinity/utils';
import { nonNullish, fromNullishNullable } from '@dfinity/utils';
import type { Monitoring } from '$declarations/mission_control/mission_control.did';
import MonitoringSentence from '$lib/components/modals/MonitoringSentence.svelte';
import MonitoringDisabled from '$lib/components/monitoring/MonitoringDisabled.svelte';
import Value from '$lib/components/ui/Value.svelte';
import { i18n } from '$lib/stores/i18n.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
interface Props {
monitoring: Monitoring | undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/lib/components/orbiter/Orbiter.svelte
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts">
import { fromNullishNullable } from '@dfinity/utils';
import type { Orbiter } from '$declarations/mission_control/mission_control.did';
import CanisterMonitoring from '$lib/components/canister/CanisterMonitoring.svelte';
import CanisterOverview from '$lib/components/canister/CanisterOverview.svelte';
Expand All @@ -10,7 +11,6 @@
import { orbiterNotLoaded } from '$lib/derived/orbiter.derived';
import { i18n } from '$lib/stores/i18n.store';
import { versionStore } from '$lib/stores/version.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
interface Props {
orbiter: Orbiter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts">
import { fromNullishNullable } from '@dfinity/utils';
import type { Satellite } from '$declarations/mission_control/mission_control.did';
import CanisterMonitoring from '$lib/components/canister/CanisterMonitoring.svelte';
import CanisterOverview from '$lib/components/canister/CanisterOverview.svelte';
Expand All @@ -13,7 +14,6 @@
import { satellitesNotLoaded } from '$lib/derived/satellite.derived';
import { i18n } from '$lib/stores/i18n.store';
import type { SatelliteIdText } from '$lib/types/satellite';
import { fromNullishNullable } from '$lib/utils/did.utils';
interface Props {
satellite: Satellite;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { missionControlSettingsUncertifiedStore } from '$lib/stores/mission-control.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { nonNullish } from '@dfinity/utils';
import { fromNullishNullable, nonNullish } from '@dfinity/utils';
import { derived } from 'svelte/store';

export const missionControlSettings = derived(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { missionControlUserUncertifiedStore } from '$lib/stores/mission-control.store';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { metadataEmail } from '$lib/utils/metadata.utils';
import { fromNullishNullable } from '@dfinity/utils';
import { derived } from 'svelte/store';

export const missionControlUserData = derived(
Expand Down
3 changes: 1 addition & 2 deletions src/frontend/src/lib/derived/orbiter-satellites.derived.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ import { orbiterConfigs } from '$lib/derived/orbiter.derived';
import { satellitesStore } from '$lib/derived/satellite.derived';
import type { OrbiterSatelliteConfigEntry } from '$lib/types/ortbiter';
import type { SatelliteIdText } from '$lib/types/satellite';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { satelliteName } from '$lib/utils/satellite.utils';
import { first } from '$lib/utils/utils';
import type { Principal } from '@dfinity/principal';
import { fromNullable, nonNullish } from '@dfinity/utils';
import { fromNullable, fromNullishNullable, nonNullish } from '@dfinity/utils';
import { derived, type Readable } from 'svelte/store';

export const orbiterSatellitesConfig: Readable<
Expand Down
3 changes: 1 addition & 2 deletions src/frontend/src/lib/services/auth.config.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {
buildDeleteAuthenticationConfig,
buildSetAuthenticationConfig
} from '$lib/utils/auth.config.utils';
import { fromNullishNullable } from '$lib/utils/did.utils';
import { isNullish, nonNullish, toNullable } from '@dfinity/utils';
import { fromNullishNullable, isNullish, nonNullish, toNullable } from '@dfinity/utils';
import { get } from 'svelte/store';

interface UpdateAuthConfigParams {
Expand Down
Loading

0 comments on commit b60f334

Please sign in to comment.