Skip to content

Commit ab476cc

Browse files
djechlin-mongodbdjechlin-mongodb
committed
simplify some changes, need to figure out why this reproed with = false
1 parent 031dca3 commit ab476cc

File tree

3 files changed

+39
-70
lines changed

3 files changed

+39
-70
lines changed

‎configs/webpack-config-compass/src/webpack-plugin-start-electron.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ export class WebpackPluginStartElectron {
166166
this.logger.info(
167167
'- Ctrl+A to restart the main process with extra arguments'
168168
);
169-
this.logger.info('appPath: ', this.appPath);
170-
this.logger.info('extraArgs: ', extraArgs);
171-
this.logger.info('env:', process.env);
172169
this.electronProcess = spawn(
173170
// XXX: in non-electron environment this import returns path to the binary
174171
electronBinaryPath as unknown as string,

‎packages/compass-welcome/src/components/modal.tsx‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -40,45 +40,45 @@ export const WelcomeModal: React.FunctionComponent<WelcomeModalProps> = ({
4040
closeModal();
4141
}, [closeModal]);
4242

43-
return <div>hello</div>;
44-
// <MarketingModal
45-
// data-testid="welcome-modal"
46-
// open={isOpen}
47-
// onClose={close}
48-
// onButtonClick={close}
49-
// title="Welcome to Compass"
50-
// buttonText="Start"
51-
// showBlob
52-
// blobPosition="top right"
53-
// disclaimer={
54-
// networkTraffic ? (
55-
// <div className={disclaimer}>
56-
// To help improve our products, anonymous usage data is collected and
57-
// sent to MongoDB in accordance with MongoDB&apos;s privacy policy.
58-
// <br />
59-
// Manage this behaviour on the Compass{' '}
60-
// <Link
61-
// data-testid="open-settings-link"
62-
// hideExternalIcon
63-
// className={link}
64-
// onClick={goToSettings}
65-
// >
66-
// Settings
67-
// </Link>{' '}
68-
// page.
69-
// </div>
70-
// ) : undefined
71-
// }
72-
// graphic={<WelcomeModalImage width={156} height={209} />}
73-
// linkText={''}
74-
// darkMode={darkMode}
75-
// >
76-
// <Body>
77-
// Build aggregation pipelines, optimize queries, analyze schemas,
78-
// and&nbsp;more. All with the GUI built by - and for - MongoDB.
79-
// </Body>
80-
// </MarketingModal>
81-
// );
43+
return (
44+
<MarketingModal
45+
data-testid="welcome-modal"
46+
open={isOpen}
47+
onClose={close}
48+
onButtonClick={close}
49+
title="Welcome to Compass"
50+
buttonText="Start"
51+
showBlob
52+
blobPosition="top right"
53+
disclaimer={
54+
networkTraffic ? (
55+
<div className={disclaimer}>
56+
To help improve our products, anonymous usage data is collected and
57+
sent to MongoDB in accordance with MongoDB&apos;s privacy policy.
58+
<br />
59+
Manage this behaviour on the Compass{' '}
60+
<Link
61+
data-testid="open-settings-link"
62+
hideExternalIcon
63+
className={link}
64+
onClick={goToSettings}
65+
>
66+
Settings
67+
</Link>{' '}
68+
page.
69+
</div>
70+
) : undefined
71+
}
72+
graphic={<WelcomeModalImage width={156} height={209} />}
73+
linkText={''}
74+
darkMode={darkMode}
75+
>
76+
<Body>
77+
Build aggregation pipelines, optimize queries, analyze schemas,
78+
and&nbsp;more. All with the GUI built by - and for - MongoDB.
79+
</Body>
80+
</MarketingModal>
81+
);
8282
};
8383

8484
export default withPreferences(WelcomeModal, ['networkTraffic']);

‎packages/compass/src/app/index.tsx‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,9 @@ import { defaultPreferencesInstance } from 'compass-preferences-model';
1111
import semver from 'semver';
1212
import { CompassElectron } from './components/entrypoint';
1313
import { openToast } from '@mongodb-js/compass-components';
14-
import http from 'http';
15-
import https from 'https';
1614

1715
console.log('DJECHLIN WE ARE IN INDEX');
1816

19-
// Intercept HTTP requests
20-
const originalHttpRequest = http.request;
21-
http.request = function (...args: any[]) {
22-
console.log('DJECHLIN HTTP Request:', args);
23-
log.error(
24-
mongoLogId(1_001_818_275),
25-
'DJECHLIN',
26-
'DJECHLIN HTTP REQUEST HAPPENED OH NO',
27-
{ message: args }
28-
);
29-
return originalHttpRequest.apply(this, args as any);
30-
};
31-
32-
// Intercept HTTPS requests
33-
const originalHttpsRequest = https.request;
34-
https.request = function (...args: any[]) {
35-
console.log('DJECHLIN HTTPS Request:', args);
36-
log.error(
37-
mongoLogId(1_001_818_276),
38-
'DJECHLIN',
39-
'DJECHLIN HTTPS SSSSSSSSSS REQUEST HAPPENED OH NO',
40-
{ message: args }
41-
);
42-
return originalHttpsRequest.apply(this, args as any);
43-
};
44-
4517
// https://github.com/nodejs/node/issues/40537
4618
dns.setDefaultResultOrder('ipv4first');
4719

0 commit comments

Comments
 (0)