Skip to content

Commit 2013a8f

Browse files
authored
fix(compass-web): entrypoint provider order COMPASS-9918 (#7417)
fix web entrypoint provider order
1 parent a6ab973 commit 2013a8f

File tree

1 file changed

+39
-41
lines changed

1 file changed

+39
-41
lines changed

packages/compass-web/src/entrypoint.tsx

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -496,46 +496,44 @@ const CompassWeb = ({
496496
orgId={orgId}
497497
projectId={projectId}
498498
>
499-
<CompassConnections
500-
appName={appName ?? 'Compass Web'}
501-
onFailToLoadConnections={onFailToLoadConnections}
502-
onExtraConnectionDataRequest={() => {
503-
return Promise.resolve([{}, null] as [
504-
Record<string, unknown>,
505-
null
506-
]);
507-
}}
508-
onAutoconnectInfoRequest={(connectionStore) => {
509-
if (autoconnectId) {
510-
return connectionStore.loadAll().then(
511-
(connections) => {
512-
return connections.find(
513-
(connectionInfo) =>
514-
connectionInfo.id === autoconnectId
515-
);
516-
},
517-
(err) => {
518-
const { log, mongoLogId } = logger;
519-
log.warn(
520-
mongoLogId(1_001_000_329),
521-
'Compass Web',
522-
'Could not load connections when trying to autoconnect',
523-
{ err: err.message }
524-
);
525-
return undefined;
526-
}
527-
);
528-
}
529-
return Promise.resolve(undefined);
530-
}}
499+
<CompassAssistantProvider
500+
originForPrompt="atlas-data-explorer"
501+
appNameForPrompt={APP_NAMES_FOR_PROMPT.DataExplorer}
531502
>
532-
<CompassInstanceStorePlugin>
533-
<CompassAssistantProvider
534-
originForPrompt="atlas-data-explorer"
535-
appNameForPrompt={
536-
APP_NAMES_FOR_PROMPT.DataExplorer
503+
<CompassConnections
504+
appName={appName ?? 'Compass Web'}
505+
onFailToLoadConnections={onFailToLoadConnections}
506+
onExtraConnectionDataRequest={() => {
507+
return Promise.resolve([{}, null] as [
508+
Record<string, unknown>,
509+
null
510+
]);
511+
}}
512+
onAutoconnectInfoRequest={(connectionStore) => {
513+
if (autoconnectId) {
514+
return connectionStore.loadAll().then(
515+
(connections) => {
516+
return connections.find(
517+
(connectionInfo) =>
518+
connectionInfo.id === autoconnectId
519+
);
520+
},
521+
(err) => {
522+
const { log, mongoLogId } = logger;
523+
log.warn(
524+
mongoLogId(1_001_000_329),
525+
'Compass Web',
526+
'Could not load connections when trying to autoconnect',
527+
{ err: err.message }
528+
);
529+
return undefined;
530+
}
531+
);
537532
}
538-
>
533+
return Promise.resolve(undefined);
534+
}}
535+
>
536+
<CompassInstanceStorePlugin>
539537
<FieldStorePlugin>
540538
<WithConnectionsStore>
541539
<CompassWorkspace
@@ -555,9 +553,9 @@ const CompassWeb = ({
555553
projectId={projectId}
556554
isCloudOptIn={true}
557555
/>
558-
</CompassAssistantProvider>
559-
</CompassInstanceStorePlugin>
560-
</CompassConnections>
556+
</CompassInstanceStorePlugin>
557+
</CompassConnections>
558+
</CompassAssistantProvider>
561559
</AtlasCloudConnectionStorageProvider>
562560
</DataModelStorageServiceProviderInMemory>
563561
</WithStorageProviders>

0 commit comments

Comments
 (0)