Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: merge back main into dev branch #12232

Merged
merged 34 commits into from
Aug 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
33a0dc6
Merge pull request #12176 from OfficeDev/dev
kimizhu Aug 7, 2024
2502a99
perf: update generator for json path
KennethBWSong Aug 7, 2024
b682900
Merge pull request #12178 from OfficeDev/bowsong/hotfix_generator
kimizhu Aug 7, 2024
d38773f
fix: scaffold twice
jayzhang Aug 7, 2024
9f109f2
fix: command execute failed due to shell-quote
lijie-lee Aug 8, 2024
5395cb0
Merge pull request #12187 from OfficeDev/huajie/hotfix-oaddin
kimizhu Aug 8, 2024
339ac94
Merge pull request #12189 from OfficeDev/lijie/fix/local_debug_cmd_ex…
kimizhu Aug 8, 2024
ff529f6
fix: cli description
yuqizhou77 Aug 8, 2024
7e2166b
test: ut
yuqizhou77 Aug 8, 2024
116d05f
test: ut
yuqizhou77 Aug 8, 2024
f319927
Merge pull request #12192 from OfficeDev/yuqzho/cli-description
kimizhu Aug 8, 2024
926fa16
fix: the placeholder is not replace app name
huimiu Aug 8, 2024
0c0d708
Merge branch 'main' into hui/typeb-fix
huimiu Aug 8, 2024
6f0d7ca
Merge pull request #12195 from OfficeDev/hui/typeb-fix
kimizhu Aug 8, 2024
f1fd978
fix: fix bug in ai generator python template
KennethBWSong Aug 12, 2024
d46dd3a
fix: add missing import in ai generator python openai template
KennethBWSong Aug 12, 2024
a58046c
Merge pull request #12207 from OfficeDev/bowsong/fix_python_template
kimizhu Aug 12, 2024
da4e4ef
fix(vsc): svg not shown in react app
tecton Aug 12, 2024
fe5c506
Merge pull request #12211 from OfficeDev/nintan/fix-svg-import
kimizhu Aug 12, 2024
13203a2
fix: update launch file for ai generator python template
KennethBWSong Aug 12, 2024
f1bbfe3
docs: update august changelog
MuyangAmigo Aug 12, 2024
b744d9d
docs: update august changelog for language issues
MuyangAmigo Aug 12, 2024
8e22d5e
Merge branch 'main' into changelog-aug
qinezh Aug 13, 2024
2c8d5a8
fix: dc template instruction/description
yuqizhou77 Aug 13, 2024
9620719
Merge pull request #12212 from OfficeDev/bowsong/hotfix_launch
kimizhu Aug 13, 2024
8b5f7bf
Merge branch 'main' into changelog-aug
MuyangAmigo Aug 13, 2024
bfe7f2d
docs: update changelog
MuyangAmigo Aug 13, 2024
b9e539f
Merge pull request #12215 from OfficeDev/changelog-aug
kimizhu Aug 13, 2024
0a4a7c1
fix: dc template more
yuqizhou77 Aug 13, 2024
1ecfb18
Merge branch 'main' into yuqzho/dc-template-fix
yuqizhou77 Aug 13, 2024
4ae3227
Merge pull request #12221 from OfficeDev/yuqzho/dc-template-fix
kimizhu Aug 13, 2024
2857e9f
fix: fix remote run for ai generator python template
KennethBWSong Aug 14, 2024
d0102ed
fix: fix lint error
KennethBWSong Aug 15, 2024
b2df3df
Merge pull request #12227 from OfficeDev/bowsong/hotfix_remote
kimizhu Aug 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: cli description
yuqizhou77 committed Aug 8, 2024

Verified

This commit was signed with the committer’s verified signature.
Kikobeats Kiko Beats
commit ff529f6ca8af4e267587809c9da91f7435c522d1
4 changes: 3 additions & 1 deletion packages/cli/src/userInteraction.ts
Original file line number Diff line number Diff line change
@@ -206,7 +206,9 @@ class CLIUserInteraction implements UserInteraction {
const choices = (option as OptionItem[]).map((op) => {
return {
id: op.id,
title: labelClean(op.label),
title: !op.description
? labelClean(op.label)
: labelClean(op.label) + ` (${op.description})`,
detail: op.detail,
};
});
22 changes: 22 additions & 0 deletions packages/cli/tests/unit/ui.tests.ts
Original file line number Diff line number Diff line change
@@ -126,6 +126,28 @@ describe("User Interaction Tests", function () {
}
});

it("Add description in title", async () => {
const config: SingleSelectConfig = {
name: "test",
title: "test",
options: [{ id: "id1", description: "some description", label: "label" }],
};
sandbox.stub(UI, "loadSelectDynamicData").resolves(ok({} as any));
sandbox.stub(UI, "singleSelect").resolves(ok("id1"));
const result = await UI.selectOption(config);
expect(result.isOk());
if (result.isOk()) {
// expect(result.value.result).deep.equals({
// id: "a",
// cliName: "aa",
// label: "aaa",
// });
console.log(result.value);
} else {
console.log(result.error);
}
});

it("invalid option", async () => {
sandbox.stub(UI, "singleSelect").resolves(ok("c"));
const config: SingleSelectConfig = {