Skip to content

Commit 64501f5

Browse files
authored
Merge pull request Azure#490 from necusjz/fix-cli-version-mismatch
fix api version mismatch in cli tab
2 parents 5c05310 + c36ce3c commit 64501f5

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/web/src/views/cli/CLIModGeneratorProfileCommandTree.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ const CLIModGeneratorProfileCommandTree: React.FC<CLIModGeneratorProfileCommandT
469469
unloadedCommand.selected,
470470
unloadedCommand.modified,
471471
unloadedCommand.registered,
472+
unloadedCommand.selectedVersion,
472473
);
473474
}) ?? tree
474475
);
@@ -578,6 +579,7 @@ function decodeProfileCTCommand(
578579
selected: boolean = false,
579580
modified: boolean = false,
580581
registered: boolean | undefined = undefined,
582+
selectedVersion: string | undefined = undefined,
581583
): ProfileCTCommand {
582584
const versions = response.versions?.map((value: any) => decodeProfileCTCommandVersion(value));
583585
const command = {
@@ -591,10 +593,16 @@ function decodeProfileCTCommand(
591593
registered: registered,
592594
};
593595
if (selected) {
594-
const selectedVersion = versions ? versions[0].name : undefined;
596+
let version: string | undefined;
597+
if (selectedVersion !== undefined) {
598+
version = selectedVersion;
599+
} else {
600+
version = versions ? versions[0].name : undefined;
601+
}
602+
595603
return {
596604
...command,
597-
selectedVersion: selectedVersion,
605+
selectedVersion: version,
598606
};
599607
} else {
600608
return command;
@@ -607,7 +615,7 @@ function decodeProfileCTCommandGroup(response: CLISpecsCommandGroup, selected: b
607615
? Object.fromEntries(
608616
Object.entries(response.commands).map(([name, command]) => [
609617
name,
610-
decodeProfileCTCommand(command, selected, selected),
618+
decodeProfileCTCommand(command, selected, selected, undefined),
611619
]),
612620
)
613621
: undefined;

0 commit comments

Comments
 (0)