feat: rename build version

package.json

@@ -84,7 +84,7 @@
 		"@dfinity/identity": "^0.20.2",
 		"@dfinity/principal": "^0.20.2",
 		"@dfinity/utils": "next",
-		"@junobuild/admin": "^0.0.44-next-2024-02-01",
+		"@junobuild/admin": "^0.0.44-next-2024-02-02.1",
 		"@junobuild/ledger": "^0.0.28-next-2024-01-30",
 		"@junobuild/utils": "^0.0.17-next-2024-01-30",
 		"buffer": "^6.0.3",

src/declarations/satellite/satellite.did.d.ts

@@ -198,6 +198,7 @@ export interface UploadChunkResult {
 	chunk_id: bigint;
 }
 export interface _SERVICE {
+	build_version: ActorMethod<[], string>;
 	commit_asset_upload: ActorMethod<[CommitBatch], undefined>;
 	count_assets: ActorMethod<[string], bigint>;
 	count_docs: ActorMethod<[string], bigint>;
@@ -236,6 +237,5 @@ export interface _SERVICE {
 	set_rule: ActorMethod<[RulesType, string, SetRule], undefined>;
 	upload_asset_chunk: ActorMethod<[UploadChunk], UploadChunkResult>;
 	version: ActorMethod<[], string>;
-	version_build: ActorMethod<[], string>;
 }
 export declare const idlFactory: IDL.InterfaceFactory;

src/declarations/satellite/satellite.factory.did.js

@@ -194,6 +194,7 @@ export const idlFactory = ({ IDL }) => {
 	});
 	const UploadChunkResult = IDL.Record({ chunk_id: IDL.Nat });
 	return IDL.Service({
+		build_version: IDL.Func([], [IDL.Text], ['query']),
 		commit_asset_upload: IDL.Func([CommitBatch], [], []),
 		count_assets: IDL.Func([IDL.Text], [IDL.Nat64], ['query']),
 		count_docs: IDL.Func([IDL.Text], [IDL.Nat64], ['query']),
@@ -252,8 +253,7 @@ export const idlFactory = ({ IDL }) => {
 		),
 		set_rule: IDL.Func([RulesType, IDL.Text, SetRule], [], []),
 		upload_asset_chunk: IDL.Func([UploadChunk], [UploadChunkResult], []),
-		version: IDL.Func([], [IDL.Text], ['query']),
-		version_build: IDL.Func([], [IDL.Text], ['query'])
+		version: IDL.Func([], [IDL.Text], ['query'])
 	});
 };
 // @ts-ignore

src/declarations/satellite/satellite.factory.did.mjs

@@ -194,6 +194,7 @@ export const idlFactory = ({ IDL }) => {
 	});
 	const UploadChunkResult = IDL.Record({ chunk_id: IDL.Nat });
 	return IDL.Service({
+		build_version: IDL.Func([], [IDL.Text], ['query']),
 		commit_asset_upload: IDL.Func([CommitBatch], [], []),
 		count_assets: IDL.Func([IDL.Text], [IDL.Nat64], ['query']),
 		count_docs: IDL.Func([IDL.Text], [IDL.Nat64], ['query']),
@@ -252,8 +253,7 @@ export const idlFactory = ({ IDL }) => {
 		),
 		set_rule: IDL.Func([RulesType, IDL.Text, SetRule], [], []),
 		upload_asset_chunk: IDL.Func([UploadChunk], [UploadChunkResult], []),
-		version: IDL.Func([], [IDL.Text], ['query']),
-		version_build: IDL.Func([], [IDL.Text], ['query'])
+		version: IDL.Func([], [IDL.Text], ['query'])
 	});
 };
 // @ts-ignore

src/frontend/src/lib/api/satellites.api.ts

@@ -141,15 +141,15 @@ export const satelliteVersion = async ({
 	return version();
 };
 
-export const satelliteVersionBuild = async ({
+export const satelliteBuildVersion = async ({
 	satelliteId,
 	identity
 }: {
 	satelliteId: Principal;
 	identity: OptionIdentity;
 }): Promise<string> => {
-	const { version_build } = await getSatelliteActor({ satelliteId, identity });
-	return version_build();
+	const { build_version } = await getSatelliteActor({ satelliteId, identity });
+	return build_version();
 };
 
 export const setCustomDomain = async ({

src/frontend/src/lib/services/console.services.ts

@@ -2,7 +2,7 @@ import type { Orbiter } from '$declarations/mission_control/mission_control.did'
 import { initMissionControl as initMissionControlApi, releasesVersion } from '$lib/api/console.api';
 import { missionControlVersion } from '$lib/api/mission-control.api';
 import { orbiterVersion } from '$lib/api/orbiter.api';
-import { satelliteVersion, satelliteVersionBuild } from '$lib/api/satellites.api';
+import { satelliteBuildVersion, satelliteVersion } from '$lib/api/satellites.api';
 import { authStore } from '$lib/stores/auth.store';
 import { toasts } from '$lib/stores/toasts.store';
 import { versionStore, type ReleaseVersionSatellite } from '$lib/stores/version.store';
@@ -100,18 +100,17 @@ export const loadVersion = async ({
 			satelliteId: Principal
 		): Promise<Omit<ReleaseVersionSatellite, 'release'> | undefined> => {
 			// Backwards compatibility for Satellite <= 0.0.14 which did not expose the end point "version_build"
-			const queryVersionBuild = async (): Promise<string | undefined> => {
+			const queryBuildVersion = async (): Promise<string | undefined> => {
 				try {
-					const version = await satelliteVersionBuild({ satelliteId, identity });
-					return version;
+					return await satelliteBuildVersion({ satelliteId, identity });
 				} catch (_: unknown) {
 					return undefined;
 				}
 			};
 
-			const [version, versionBuild, metadataBuild] = await Promise.allSettled([
+			const [version, buildVersion, buildType] = await Promise.allSettled([
 				satelliteVersion({ satelliteId, identity }),
-				queryVersionBuild(),
+				queryBuildVersion(),
 				satelliteBuildType({
 					satellite: {
 						satelliteId: satelliteId.toText(),
@@ -129,9 +128,9 @@ export const loadVersion = async ({
 
 			return {
 				current,
-				...(versionBuild.status === 'fulfilled' &&
-					nonNullish(versionBuild.value) && { currentBuild: versionBuild.value }),
-				build: metadataBuild.status === 'fulfilled' ? metadataBuild.value ?? 'stock' : 'stock'
+				...(buildVersion.status === 'fulfilled' &&
+					nonNullish(buildVersion.value) && { currentBuild: buildVersion.value }),
+				build: buildType.status === 'fulfilled' ? buildType.value ?? 'stock' : 'stock'
 			};
 		};
 

src/libs/satellite/src/lib.rs

@@ -292,7 +292,7 @@ macro_rules! include_satellite {
         };
 
         #[ic_cdk::query]
-        pub fn version_build() -> String {
+        pub fn build_version() -> String {
             env!("CARGO_PKG_VERSION").to_string()
         }
 

src/satellite/satellite.did

@@ -209,5 +209,5 @@ service : () -> {
   set_rule : (RulesType, text, SetRule) -> ();
   upload_asset_chunk : (UploadChunk) -> (UploadChunkResult);
   version : () -> (text) query;
-  version_build : () -> (text) query;
+  build_version : () -> (text) query
 }