Skip to content

Commit bdf8299

Browse files
vas3avas3a
committed
fix circular dependency, update routes in self service
1 parent b66975c commit bdf8299

File tree

7 files changed

+63
-52
lines changed

7 files changed

+63
-52
lines changed

‎src/constants/index.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,8 @@ import imgProductProblemStatement from "../assets/images/products/product-main-p
3838
import imgProductFindMeData from "../assets/images/products/product-main-photos/find-me-data.jpeg";
3939
import imgProductWebsiteDesign from "../assets/images/products/product-main-photos/web-design.jpeg";
4040
import imgRedBlueGradient from "../assets/images/products/product-main-photos/reb-blue-gradient-background.jpeg";
41-
import { EnvironmentConfig } from "../../src-ts";
42-
import { AppSubdomain } from "../../src-ts/config";
4341

44-
// Need to re-define this in here, otherwise if we're loading it from tools/work/work.routes
45-
// it creates a circular dependency within webpack somehow and it breaks the build
46-
export const rootRoute = EnvironmentConfig.SUBDOMAIN === AppSubdomain.work ? '' : `/${AppSubdomain.work}`
47-
export const selfServiceRootRoute = `${rootRoute}/self-service`
42+
import { selfServiceRootRoute } from './routes';
4843

4944
export const UNDER_MAINTENANCE = false;
5045

‎src/constants/products/DataAdvisory/index.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1+
import { selfServiceRootRoute } from "../../routes";
2+
13
export const CHALLENGE_FIELD_VALUES = {
24
trackId: "c0f5d461-8219-4c14-878a-c3a3f356466d",
35
typeId: "927abff4-7af9-4145-8ba1-577c16e64e2e",
46
timelineTemplateId: "7ebf1c69-f62f-4d3a-bdfb-fe9ddb56861c",
57
};
68

79
export const INTAKE_FORM_ROUTES = [
8-
"/self-service/wizard",
9-
"/self-service/new/data-advisory/basic-info",
10-
"/self-service",
11-
"/self-service",
12-
"/self-service/new/data-advisory/login-prompt",
13-
"/self-service",
14-
"/self-service/new/data-advisory/review",
15-
"/self-service/new/data-advisory/thank-you",
10+
`${selfServiceRootRoute}/wizard`,
11+
`${selfServiceRootRoute}/new/data-advisory/basic-info`,
12+
`${selfServiceRootRoute}`,
13+
`${selfServiceRootRoute}`,
14+
`${selfServiceRootRoute}/new/data-advisory/login-prompt`,
15+
`${selfServiceRootRoute}`,
16+
`${selfServiceRootRoute}/new/data-advisory/review`,
17+
`${selfServiceRootRoute}/new/data-advisory/thank-you`,
1618
];
1719

1820
export const DEFAULT_TIMELINE = [

‎src/constants/products/DataExploration/index.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1+
import { selfServiceRootRoute } from "../../routes";
2+
13
export const CHALLENGE_FIELD_VALUES = {
24
trackId: "c0f5d461-8219-4c14-878a-c3a3f356466d",
35
typeId: "927abff4-7af9-4145-8ba1-577c16e64e2e",
46
timelineTemplateId: "7ebf1c69-f62f-4d3a-bdfb-fe9ddb56861c",
57
};
68

79
export const INTAKE_FORM_ROUTES = [
8-
"/self-service/wizard",
9-
"/self-service/new/data-exploration/basic-info",
10-
"/self-service",
11-
"/self-service",
12-
"/self-service/new/data-exploration/login-prompt",
13-
"/self-service",
14-
"/self-service/new/data-exploration/review",
15-
"/self-service/new/data-exploration/thank-you",
10+
`${selfServiceRootRoute}/wizard`,
11+
`${selfServiceRootRoute}/new/data-exploration/basic-info`,
12+
`${selfServiceRootRoute}`,
13+
`${selfServiceRootRoute}`,
14+
`${selfServiceRootRoute}/new/data-exploration/login-prompt`,
15+
`${selfServiceRootRoute}`,
16+
`${selfServiceRootRoute}/new/data-exploration/review`,
17+
`${selfServiceRootRoute}/new/data-exploration/thank-you`,
1618
];
1719

1820
export const DEFAULT_TIMELINE = [

‎src/constants/products/FindMeData/index.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1+
import { selfServiceRootRoute } from "../../routes";
2+
13
export const CHALLENGE_FIELD_VALUES = {
24
trackId: "c0f5d461-8219-4c14-878a-c3a3f356466d",
35
typeId: "927abff4-7af9-4145-8ba1-577c16e64e2e",
46
timelineTemplateId: "7ebf1c69-f62f-4d3a-bdfb-fe9ddb56861c",
57
};
68

79
export const INTAKE_FORM_ROUTES = [
8-
"/self-service/wizard",
9-
"/self-service/new/find-me-data/basic-info",
10-
"/self-service",
11-
"/self-service",
12-
"/self-service/new/find-me-data/login-prompt",
13-
"/self-service",
14-
"/self-service/new/find-me-data/review",
15-
"/self-service/new/find-me-data/thank-you",
10+
`${selfServiceRootRoute}/wizard`,
11+
`${selfServiceRootRoute}/new/find-me-data/basic-info`,
12+
`${selfServiceRootRoute}`,
13+
`${selfServiceRootRoute}`,
14+
`${selfServiceRootRoute}/new/find-me-data/login-prompt`,
15+
`${selfServiceRootRoute}`,
16+
`${selfServiceRootRoute}/new/find-me-data/review`,
17+
`${selfServiceRootRoute}/new/find-me-data/thank-you`,
1618
];
1719

1820
export const DEFAULT_TIMELINE = [

‎src/constants/products/WebsiteDesign/index.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1+
import { selfServiceRootRoute } from "../../routes";
2+
13
export const CHALLENGE_FIELD_VALUES = {
24
trackId: "5fa04185-041f-49a6-bfd1-fe82533cd6c8",
35
typeId: "927abff4-7af9-4145-8ba1-577c16e64e2e",
46
timelineTemplateId: "918f6a3e-1a63-4680-8b5e-deb95b1411e7",
57
};
68

79
export const INTAKE_FORM_ROUTES = [
8-
"/self-service/wizard",
9-
"/self-service/new/website-design/basic-info",
10-
"/self-service",
11-
"/self-service",
12-
"/self-service/new/website-design/login-prompt",
13-
"/self-service",
14-
"/self-service/new/website-design/review",
15-
"/self-service/new/website-design/thank-you",
10+
`${selfServiceRootRoute}/wizard`,
11+
`${selfServiceRootRoute}/new/website-design/basic-info`,
12+
`${selfServiceRootRoute}`,
13+
`${selfServiceRootRoute}`,
14+
`${selfServiceRootRoute}/new/website-design/login-prompt`,
15+
`${selfServiceRootRoute}`,
16+
`${selfServiceRootRoute}/new/website-design/review`,
17+
`${selfServiceRootRoute}/new/website-design/thank-you`,
1618
];
1719

1820
export const DEFAULT_TIMELINE = [

‎src/constants/products/WebsiteDesignLegacy/index.js‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { selfServiceRootRoute } from "../../routes";
2+
13
export const PRIZES_PAYMENT_BREAKDOWN = [0.5, 0.2, 0.1];
24
export const REVIEWER_PAYMENT_BREAKDOWN = [0.1, 0.1];
35
export const DEFAULT_DURATION = "4-6";
@@ -111,54 +113,54 @@ export const DURATION_MAPPING = [
111113
];
112114

113115
export const INTAKE_FORM_ROUTES = [
114-
"/self-service/wizard",
115-
"/self-service/new/website-design-legacy/basic-info",
116-
"/self-service/new/website-design-legacy/website-purpose",
117-
"/self-service/new/website-design-legacy/page-details",
118-
"/self-service/new/website-design-legacy/login-prompt",
119-
"/self-service/new/website-design-legacy/branding",
120-
"/self-service/new/website-design-legacy/review",
121-
"/self-service/new/website-design-legacy/thank-you",
116+
`${selfServiceRootRoute}/wizard`,
117+
`${selfServiceRootRoute}/new/website-design-legacy/basic-info`,
118+
`${selfServiceRootRoute}/new/website-design-legacy/website-purpose`,
119+
`${selfServiceRootRoute}/new/website-design-legacy/page-details`,
120+
`${selfServiceRootRoute}/new/website-design-legacy/login-prompt`,
121+
`${selfServiceRootRoute}/new/website-design-legacy/branding`,
122+
`${selfServiceRootRoute}/new/website-design-legacy/review`,
123+
`${selfServiceRootRoute}/new/website-design-legacy/thank-you`,
122124
];
123125

124126
export const PROGRESS_LEVELS = [
125127
{
126128
label: "Basic Info",
127-
url: "/self-service/new/website-design-legacy/basic-info",
129+
url: `${selfServiceRootRoute}/new/website-design-legacy/basic-info`,
128130
trueIndex: 2,
129131
showIndex: 1,
130132
visibleInProgressIndicator: true,
131133
},
132134
{
133135
label: "REVIEW REQUIREMENTS",
134-
url: "/self-service/new/website-design-legacy/basic-info",
136+
url: `${selfServiceRootRoute}/new/website-design-legacy/basic-info`,
135137
trueIndex: 2,
136138
showIndex: 1,
137139
},
138140
{
139141
label: "Website Purpose",
140-
url: "/self-service/new/website-design-legacy/website-purpose",
142+
url: `${selfServiceRootRoute}/new/website-design-legacy/website-purpose`,
141143
trueIndex: 3,
142144
showIndex: 2,
143145
visibleInProgressIndicator: true,
144146
},
145147
{
146148
label: "Page Details",
147-
url: "/self-service/new/website-design-legacy/page-details",
149+
url: `${selfServiceRootRoute}/new/website-design-legacy/page-details`,
148150
trueIndex: 4,
149151
showIndex: 3,
150152
visibleInProgressIndicator: true,
151153
},
152154
{
153155
label: "Branding",
154-
url: "/self-service/new/website-design-legacy/branding",
156+
url: `${selfServiceRootRoute}/new/website-design-legacy/branding`,
155157
trueIndex: 5,
156158
showIndex: 4,
157159
visibleInProgressIndicator: true,
158160
},
159161
{
160162
label: "Review",
161-
url: "/self-service/new/website-design-legacy/review",
163+
url: `${selfServiceRootRoute}/new/website-design-legacy/review`,
162164
trueIndex: 6,
163165
showIndex: 5,
164166
visibleInProgressIndicator: true,

‎src/constants/routes.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { AppSubdomain, EnvironmentConfig } from "../../src-ts/config"
2+
3+
// Need to re-define this in here, otherwise if we're loading it from tools/work/work.routes
4+
// it creates a circular dependency within webpack somehow and it breaks the build
5+
export const rootRoute = EnvironmentConfig.SUBDOMAIN === AppSubdomain.work ? '' : `/${AppSubdomain.work}`
6+
export const selfServiceRootRoute = `${rootRoute}/self-service`

0 commit comments

Comments
 (0)