Commite4c0ba2

committed

Made fix to support /datasource/NEW. Also fixed the datasource url for datasource configuration

1 parentad664c8 commite4c0ba2Copy full SHA for e4c0ba2

File tree

+20

-14

lines changed

+20

-14

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ export const workspaceDatasourcesURL = (workspaceId: string): string =>`
`203`	`203`	`exportconstworkspaceDatasourceEditorURL=(`
`204`	`204`	`workspaceId:string,`
`205`	`205`	`datasourceId:string,`
`206`		-):string=>`/workspace/${workspaceId}/datasources/${datasourceId}`;
	`206`	+):string=>`/workspace/${workspaceId}/datasource/${datasourceId}`;
`207`	`207`
`208`	`208`	`exportconstappLibrariesURL=():string=>`
`209`	`209`	`urlBuilder.build({`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -338,16 +338,16 @@ export class URLBuilder {`
`338`	`338`
`339`	`339`	`constentityId=this.resolveEntityId(builderParams);`
`340`	`340`
`341`		`-// Handle workspace-specific suffix modification`
`342`		`-letmodifiedSuffix=suffix;`
	`341`	`+// Handle workspace-specific URL generation`
	`342`	`+letbasePath=this.generateBasePath(entityId,mode);`
	`343`	+letsuffixPath=suffix ?`/${suffix}` :"";
`343`	`344`
`344`	`345`	`if(this.isWorkspaceContext()&&suffix?.startsWith("datasource/")){`
`345`		`-// For workspace context, remove the 'datasource/' prefix from suffix`
`346`		`-modifiedSuffix=suffix.replace("datasource/","");`
	`346`	`+// For workspace datasource URLs, use singular /datasource path`
	`347`	+basePath=`/workspace/${entityId}/datasource`;
	`348`	+suffixPath=`/${suffix.replace("datasource/","")}`;
`347`	`349`	`}`
`348`	`350`
`349`		`-constbasePath=this.generateBasePath(entityId,mode);`
`350`		`-`
`351`	`351`	`constqueryParamsToPersist=fetchQueryParamsToPersist(`
`352`	`352`	`persistExistingParams,`
`353`	`353`	`);`
`@@ -362,8 +362,6 @@ export class URLBuilder {`
`362`	`362`
`363`	`363`	`constqueryString=getQueryStringfromObject(modifiedQueryParams);`
`364`	`364`
`365`		-constsuffixPath=modifiedSuffix ?`/${modifiedSuffix}` :"";
`366`		`-`
`367`	`365`	consthashPath=hash ?`#${hash}` :"";
`368`	`366`
`369`	`367`	`// hash fragment should be at the end of the href`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,21 +119,19 @@ export const WorkspaceDatasourcesPage = (`
`119`	`119`	`{/* Create new datasource - use the exact same component */}`
`120`	`120`	`<SentryRoute`
`121`	`121`	`exact`
`122`		`-path="/workspace/:workspaceId/datasources/new"`
	`122`	`+path="/workspace/:workspaceId/datasources/NEW"`
`123`	`123`	`render={()=><WorkspaceCreateNewDatasourceTab/>}`
`124`	`124`	`/>`
`125`	`125`	`{/* Edit existing datasource - use workspace-specific editor */}`
`126`	`126`	`<SentryRoute`
`127`	`127`	`exact`
`128`		`-path="/workspace/:workspaceId/datasources/:datasourceId"`
	`128`	`+path="/workspace/:workspaceId/datasource/:datasourceId"`
`129`	`129`	`render={()=><WorkspaceDatasourceEditor/>}`
`130`	`130`	`/>`
`131`	`131`	`{/* Default list view - show "Connect a datasource" page by default */}`
`132`	`132`	`<SentryRoute`
`133`	`133`	`path="/workspace/:workspaceId/datasources"`
`134`		`-render={()=>(`
`135`		`-<WorkspaceCreateNewDatasourceTabworkspaceId={workspaceId}/>`
`136`		`-)}`
	`134`	`+render={()=><WorkspaceCreateNewDatasourceTab/>}`
`137`	`135`	`/>`
`138`	`136`	`</Switch>`
`139`	`137`	`</MainPane>`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,16 @@ export function Workspace() {`
`27`	`27`	`)}`
`28`	`28`	path={`${path}/:workspaceId/datasources`}
`29`	`29`	`/>`
	`30`	`+<SentryRoute`
	`31`	`+component={({`
	`32`	`+ match,`
	`33`	`+}:{`
	`34`	`+match:{params:{workspaceId:string}};`
	`35`	`+})=>(`
	`36`	`+<WorkspaceDatasourcesPageworkspaceId={match.params.workspaceId}/>`
	`37`	`+)}`
	`38`	+path={`${path}/:workspaceId/datasource`}
	`39`	`+/>`
`30`	`40`	`<SentryRoutecomponent={DefaultWorkspacePage}/>`
`31`	`41`	`</Switch>`
`32`	`42`	`</PageWrapper>`

Comments

(0)