Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: support templates within namespaces #5865

Merged
benbrown merged 5 commits into from
Feb 23, 2021
Merged

fix: support templates within namespaces #5865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c98626
encode the package name so special characters do not interfere
benbrown Feb 22, 2021
b246907
strip the @microsoft part off the generator name when displayed
benbrown Feb 22, 2021
349a76f
slightly more robust name prettifier
benbrown Feb 22, 2021
6b70e9f
Merge branch 'main' into benbrown/5850
a-b-r-o-w-n Feb 22, 2021
df49783
Merge branch 'main' into benbrown/5850
benbrown Feb 23, 2021
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
2 changes: 1 addition & 1 deletion Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const CreationFlowV2: React.FC<CreationFlowProps> = () => {

const handleCreateNext = async (data: string) => {
setCreationFlowStatus(CreationFlowStatus.NEW_FROM_TEMPLATE);
navigate(`./create/${data}`);
navigate(`./create/${encodeURIComponent(data)}`);
};

return (
Expand Down
3 changes: 2 additions & 1 deletion Composer/packages/server/src/models/asset/assetManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ export class AssetManager {
private getPackageDisplayName(packageName: string): string {
if (packageName) {
return packageName
.replace('generator-', '')
.replace(/^@microsoft\/generator-microsoft-bot/, '') // clean up our complex package names
.replace(/^generator-/, '') // clean up other package names too
.split('-')
.reduce((a, b) => a.charAt(0).toUpperCase() + a.slice(1) + ' ' + b.charAt(0).toUpperCase() + b.slice(1));
} else {
Expand Down