Skip to content

Commit 8f92af2

Browse files
steveohsteveoh
committed
test: remove reactfire usage
1 parent 4ec666c commit 8f92af2

14 files changed

+270
-139
lines changed

‎src/components/pageElements/AddPoint.stories.jsx‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
2-
import { initializeApp } from 'firebase/app';
3-
import { getAuth } from 'firebase/auth';
4-
import { getFunctions } from 'firebase/functions';
5-
import { getStorage } from 'firebase/storage';
6-
import { AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire';
2+
import {
3+
FirebaseAnalyticsProvider,
4+
FirebaseAppProvider,
5+
FirebaseAuthProvider,
6+
FirebaseFunctionsProvider,
7+
FirebaseStorageProvider,
8+
} from '@ugrc/utah-design-system';
79
import { useImmerReducer } from 'use-immer';
810
import reduce, { defaults } from '../reducers/AppReducer';
911
import './../../index.css';
@@ -31,19 +33,16 @@ export default {
3133
},
3234
decorators: [
3335
(Story) => {
34-
const app = initializeApp(config);
35-
const storage = getStorage(app);
36-
const functions = getFunctions(app);
37-
const auth = getAuth(app);
38-
3936
return (
4037
<QueryClientProvider client={new QueryClient()}>
41-
<FirebaseAppProvider firebaseConfig={config}>
42-
<AuthProvider sdk={auth}>
43-
<FunctionsProvider sdk={functions}>
44-
<StorageProvider sdk={storage}>{Story()}</StorageProvider>
45-
</FunctionsProvider>
46-
</AuthProvider>
38+
<FirebaseAppProvider config={config}>
39+
<FirebaseAuthProvider>
40+
<FirebaseFunctionsProvider>
41+
<FirebaseAnalyticsProvider>
42+
<FirebaseStorageProvider>{Story()}</FirebaseStorageProvider>
43+
</FirebaseAnalyticsProvider>
44+
</FirebaseFunctionsProvider>
45+
</FirebaseAuthProvider>
4746
</FirebaseAppProvider>
4847
</QueryClientProvider>
4948
);

‎src/components/pageElements/CornerSubmission/0-CornerSubmission.stories.jsx‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
2+
import {
3+
FirebaseAnalyticsProvider,
4+
FirebaseAppProvider,
5+
FirebaseAuthProvider,
6+
FirebaseFunctionsProvider,
7+
FirebaseStorageProvider,
8+
} from '@ugrc/utah-design-system';
29
import { getAnalytics } from 'firebase/analytics';
310
import { initializeApp } from 'firebase/app';
411
import { getAuth } from 'firebase/auth';
512
import { getFunctions } from 'firebase/functions';
613
import { getStorage } from 'firebase/storage';
7-
import { AnalyticsProvider, AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire';
814
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
915
import CornerSubmission from './CornerSubmission.jsx';
1016

@@ -34,11 +40,11 @@ export default {
3440

3541
return (
3642
<QueryClientProvider client={new QueryClient()}>
37-
<FirebaseAppProvider firebaseConfig={config}>
38-
<AuthProvider sdk={auth}>
39-
<FunctionsProvider sdk={functions}>
40-
<StorageProvider sdk={storage}>
41-
<AnalyticsProvider sdk={getAnalytics(app)}>
43+
<FirebaseAppProvider config={config}>
44+
<FirebaseAuthProvider sdk={auth}>
45+
<FirebaseFunctionsProvider sdk={functions}>
46+
<FirebaseStorageProvider sdk={storage}>
47+
<FirebaseAnalyticsProvider sdk={getAnalytics(app)}>
4248
<SubmissionProvider
4349
context={{
4450
section: 1,
@@ -52,10 +58,10 @@ export default {
5258
>
5359
{Story()}
5460
</SubmissionProvider>
55-
</AnalyticsProvider>
56-
</StorageProvider>
57-
</FunctionsProvider>
58-
</AuthProvider>
61+
</FirebaseAnalyticsProvider>
62+
</FirebaseStorageProvider>
63+
</FirebaseFunctionsProvider>
64+
</FirebaseAuthProvider>
5965
</FirebaseAppProvider>
6066
</QueryClientProvider>
6167
);

‎src/components/pageElements/CornerSubmission/1-Metadata.stories.jsx‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
2+
import {
3+
FirebaseAnalyticsProvider,
4+
FirebaseAppProvider,
5+
FirebaseAuthProvider,
6+
FirebaseFunctionsProvider,
7+
FirebaseStorageProvider,
8+
} from '@ugrc/utah-design-system';
29
import { initializeApp } from 'firebase/app';
310
import { getAuth } from 'firebase/auth';
411
import { getFunctions } from 'firebase/functions';
512
import { getStorage } from 'firebase/storage';
6-
import { AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire';
713
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
814
import Metadata from './Metadata.jsx';
915

@@ -33,14 +39,16 @@ export default {
3339

3440
return (
3541
<QueryClientProvider client={new QueryClient()}>
36-
<FirebaseAppProvider firebaseConfig={config}>
37-
<AuthProvider sdk={auth}>
38-
<FunctionsProvider sdk={functions}>
39-
<StorageProvider sdk={storage}>
40-
<SubmissionProvider context={{ blmPointId: 1, type: 'new' }}>{Story()}</SubmissionProvider>
41-
</StorageProvider>
42-
</FunctionsProvider>
43-
</AuthProvider>
42+
<FirebaseAppProvider config={config}>
43+
<FirebaseAuthProvider sdk={auth}>
44+
<FirebaseFunctionsProvider sdk={functions}>
45+
<FirebaseStorageProvider sdk={storage}>
46+
<FirebaseAnalyticsProvider>
47+
<SubmissionProvider context={{ blmPointId: 1, type: 'new' }}>{Story()}</SubmissionProvider>
48+
</FirebaseAnalyticsProvider>
49+
</FirebaseStorageProvider>
50+
</FirebaseFunctionsProvider>
51+
</FirebaseAuthProvider>
4452
</FirebaseAppProvider>
4553
</QueryClientProvider>
4654
);

‎src/components/pageElements/CornerSubmission/1b-Existing.stories.jsx‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import { initializeApp } from 'firebase/app';
2-
import { getAuth } from 'firebase/auth';
3-
import { getStorage } from 'firebase/storage';
4-
import { AuthProvider, FirebaseAppProvider, StorageProvider } from 'reactfire';
1+
import {
2+
FirebaseAnalyticsProvider,
3+
FirebaseAppProvider,
4+
FirebaseAuthProvider,
5+
FirebaseStorageProvider,
6+
} from '@ugrc/utah-design-system';
57
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
68
import Pdf from './Pdf.jsx';
79

@@ -49,19 +51,18 @@ if (import.meta.env.VITE_FIREBASE_CONFIG) {
4951

5052
const Template = (args) => {
5153
const data = { ...args };
52-
const app = initializeApp(config);
53-
const storage = getStorage(app);
54-
const auth = getAuth(app);
5554

5655
return (
57-
<FirebaseAppProvider firebaseApp={app}>
58-
<StorageProvider sdk={storage}>
59-
<AuthProvider sdk={auth}>
60-
<div className="relative h-screen overflow-y-auto text-white" style={{ width: '450px', maxWidth: '450px' }}>
61-
<Pdf {...data} />
62-
</div>
63-
</AuthProvider>
64-
</StorageProvider>
56+
<FirebaseAppProvider config={config}>
57+
<FirebaseStorageProvider>
58+
<FirebaseAuthProvider>
59+
<FirebaseAnalyticsProvider>
60+
<div className="relative h-screen overflow-y-auto text-white" style={{ width: '450px', maxWidth: '450px' }}>
61+
<Pdf {...data} />
62+
</div>
63+
</FirebaseAnalyticsProvider>
64+
</FirebaseAuthProvider>
65+
</FirebaseStorageProvider>
6566
</FirebaseAppProvider>
6667
);
6768
};

‎src/components/pageElements/CornerSubmission/2-Datum.stories.jsx‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,33 @@
1+
import { FirebaseAnalyticsProvider, FirebaseAppProvider } from '@ugrc/utah-design-system';
12
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
23
import CoordinatePicker from './Datum.jsx';
34

5+
let config = {
6+
apiKey: '',
7+
authDomain: '',
8+
projectId: '',
9+
storageBucket: '',
10+
messagingSenderId: '',
11+
appId: '',
12+
measurementId: '',
13+
};
14+
15+
if (import.meta.env.VITE_FIREBASE_CONFIG) {
16+
config = JSON.parse(import.meta.env.VITE_FIREBASE_CONFIG);
17+
}
18+
419
export default {
520
title: 'Corner/Submission/Parts',
621
component: CoordinatePicker,
7-
decorators: [(Story) => <SubmissionProvider context={{ blmPointId: 1, type: 'new' }}>{Story()}</SubmissionProvider>],
22+
decorators: [
23+
(Story) => (
24+
<FirebaseAppProvider config={config}>
25+
<FirebaseAnalyticsProvider>
26+
<SubmissionProvider context={{ blmPointId: 1, type: 'new' }}>{Story()}</SubmissionProvider>
27+
</FirebaseAnalyticsProvider>
28+
</FirebaseAppProvider>
29+
),
30+
],
831
parameters: {
932
backgrounds: {
1033
default: 'drawer',

‎src/components/pageElements/CornerSubmission/3-Grid.stories.jsx‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,33 @@
1+
import { FirebaseAnalyticsProvider, FirebaseAppProvider } from '@ugrc/utah-design-system';
12
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
23
import GridCoordinates from './GridCoordinates.jsx';
34

5+
let config = {
6+
apiKey: '',
7+
authDomain: '',
8+
projectId: '',
9+
storageBucket: '',
10+
messagingSenderId: '',
11+
appId: '',
12+
measurementId: '',
13+
};
14+
15+
if (import.meta.env.VITE_FIREBASE_CONFIG) {
16+
config = JSON.parse(import.meta.env.VITE_FIREBASE_CONFIG);
17+
}
18+
419
export default {
520
title: 'Corner/Submission/Parts',
621
component: GridCoordinates,
7-
decorators: [(Story) => <SubmissionProvider context={{ blmPointId: 1, type: 'new' }}>{Story()}</SubmissionProvider>],
22+
decorators: [
23+
(Story) => (
24+
<FirebaseAppProvider config={config}>
25+
<FirebaseAnalyticsProvider>
26+
<SubmissionProvider context={{ blmPointId: 1, type: 'new' }}>{Story()}</SubmissionProvider>
27+
</FirebaseAnalyticsProvider>
28+
</FirebaseAppProvider>
29+
),
30+
],
831
parameters: {
932
backgrounds: {
1033
default: 'drawer',

‎src/components/pageElements/CornerSubmission/3a-Latitude.stories.jsx‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,45 @@
1+
import { FirebaseAnalyticsProvider, FirebaseAppProvider } from '@ugrc/utah-design-system';
12
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
23
import { Latitude } from './GeographicCoordinates.jsx';
34

5+
let config = {
6+
apiKey: '',
7+
authDomain: '',
8+
projectId: '',
9+
storageBucket: '',
10+
messagingSenderId: '',
11+
appId: '',
12+
measurementId: '',
13+
};
14+
15+
if (import.meta.env.VITE_FIREBASE_CONFIG) {
16+
config = JSON.parse(import.meta.env.VITE_FIREBASE_CONFIG);
17+
}
18+
419
export default {
520
title: 'Corner/Submission/Parts',
621
component: Latitude,
722
decorators: [
823
(Story) => (
9-
<SubmissionProvider
10-
context={{
11-
blmPointId: 'UT260060S0020E0_240400',
12-
type: 'new',
13-
datum: 'grid-nad83',
14-
grid: {
15-
zone: 'north',
16-
unit: 'm',
17-
northing: 1155931.412,
18-
easting: 471992.726,
19-
},
20-
}}
21-
>
22-
{Story()}
23-
</SubmissionProvider>
24+
<FirebaseAppProvider config={config}>
25+
<FirebaseAnalyticsProvider>
26+
<SubmissionProvider
27+
context={{
28+
blmPointId: 'UT260060S0020E0_240400',
29+
type: 'new',
30+
datum: 'grid-nad83',
31+
grid: {
32+
zone: 'north',
33+
unit: 'm',
34+
northing: 1155931.412,
35+
easting: 471992.726,
36+
},
37+
}}
38+
>
39+
{Story()}
40+
</SubmissionProvider>
41+
</FirebaseAnalyticsProvider>
42+
</FirebaseAppProvider>
2443
),
2544
],
2645
parameters: {

‎src/components/pageElements/CornerSubmission/3b-Longitude.stories.jsx‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
1+
import { FirebaseAnalyticsProvider, FirebaseAppProvider } from '@ugrc/utah-design-system';
12
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
23
import { Longitude } from './GeographicCoordinates.jsx';
34

5+
let config = {
6+
apiKey: '',
7+
authDomain: '',
8+
projectId: '',
9+
storageBucket: '',
10+
messagingSenderId: '',
11+
appId: '',
12+
measurementId: '',
13+
};
14+
15+
if (import.meta.env.VITE_FIREBASE_CONFIG) {
16+
config = JSON.parse(import.meta.env.VITE_FIREBASE_CONFIG);
17+
}
18+
419
export default {
520
title: 'Corner/Submission/Parts',
621
component: Longitude,
722
decorators: [
823
(Story) => (
9-
<SubmissionProvider context={{ blmPointId: 1, type: 'new', datum: 'geographic-nad83' }}>
10-
{Story()}
11-
</SubmissionProvider>
24+
<FirebaseAppProvider config={config}>
25+
<FirebaseAnalyticsProvider>
26+
<SubmissionProvider context={{ blmPointId: 1, type: 'new', datum: 'geographic-nad83' }}>
27+
{Story()}
28+
</SubmissionProvider>
29+
</FirebaseAnalyticsProvider>
30+
</FirebaseAppProvider>
1231
),
1332
],
1433
parameters: {

‎src/components/pageElements/CornerSubmission/3c-Height.stories.jsx‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
2+
import {
3+
FirebaseAnalyticsProvider,
4+
FirebaseAppProvider,
5+
FirebaseAuthProvider,
6+
FirebaseFunctionsProvider,
7+
FirebaseStorageProvider,
8+
} from '@ugrc/utah-design-system';
29
import { getAnalytics } from 'firebase/analytics';
310
import { initializeApp } from 'firebase/app';
411
import { getAuth } from 'firebase/auth';
512
import { getFunctions } from 'firebase/functions';
613
import { getStorage } from 'firebase/storage';
7-
import { AnalyticsProvider, AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire';
814
import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx';
915
import { GeographicHeight } from './GeographicCoordinates.jsx';
1016

@@ -33,11 +39,11 @@ export default {
3339
const auth = getAuth(app);
3440
return (
3541
<QueryClientProvider client={new QueryClient()}>
36-
<FirebaseAppProvider firebaseConfig={config}>
37-
<AuthProvider sdk={auth}>
38-
<FunctionsProvider sdk={functions}>
39-
<StorageProvider sdk={storage}>
40-
<AnalyticsProvider sdk={getAnalytics(app)}>
42+
<FirebaseAppProvider config={config}>
43+
<FirebaseAuthProvider sdk={auth}>
44+
<FirebaseFunctionsProvider sdk={functions}>
45+
<FirebaseStorageProvider sdk={storage}>
46+
<FirebaseAnalyticsProvider sdk={getAnalytics(app)}>
4147
<SubmissionProvider
4248
context={{
4349
blmPointId: 1,
@@ -49,10 +55,10 @@ export default {
4955
>
5056
{Story()}
5157
</SubmissionProvider>
52-
</AnalyticsProvider>
53-
</StorageProvider>
54-
</FunctionsProvider>
55-
</AuthProvider>
58+
</FirebaseAnalyticsProvider>
59+
</FirebaseStorageProvider>
60+
</FirebaseFunctionsProvider>
61+
</FirebaseAuthProvider>
5662
</FirebaseAppProvider>
5763
</QueryClientProvider>
5864
);

0 commit comments

Comments
 (0)