Skip to content

Commit 19e6316

Browse files
hoorayimhelpinghoorayimhelping
authored
feat: remove deepLinking feature flag (it's on) (#5094)
1 parent 31d757b commit 19e6316

File tree

2 files changed

+106
-125
lines changed

2 files changed

+106
-125
lines changed

‎cypress/e2e/shared/deepLinks.test.ts‎

Lines changed: 105 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -12,127 +12,111 @@ describe('Deep linking', () => {
1212
// so you'll probably need to follow-up with the docs and/or marketing teams.
1313
it('should be redirected to the approprate page from a shortened link', () => {
1414
cy.get('@org').then((org: Organization) => {
15-
cy.setFeatureFlags({
16-
deepLinking: true,
17-
}).then(() => {
18-
cy.wait(1000)
19-
cy.visit('/me/about')
20-
cy.location('pathname').should('eq', `/orgs/${org.id}/about`)
21-
22-
cy.visit('/me/alerts')
23-
cy.location('pathname').should('eq', `/orgs/${org.id}/alerting`)
24-
25-
cy.visit('/me/billing')
26-
cy.location('pathname').should('eq', `/orgs/${org.id}/billing`)
27-
28-
cy.visit('/me/buckets')
29-
cy.location('pathname').should(
30-
'eq',
31-
`/orgs/${org.id}/load-data/buckets`
32-
)
33-
34-
cy.visit('/me/csharpclient')
35-
cy.location('pathname').should(
36-
'eq',
37-
`/orgs/${org.id}/load-data/client-libraries/csharp`
38-
)
39-
40-
cy.visit('/me/dashboards')
41-
cy.location('pathname').should('eq', `/orgs/${org.id}/dashboards-list`)
42-
43-
cy.visit('/me/data-explorer')
44-
cy.location('pathname').should('eq', `/orgs/${org.id}/data-explorer`)
45-
46-
cy.visit('/me/goclient')
47-
cy.location('pathname').should(
48-
'eq',
49-
`/orgs/${org.id}/load-data/client-libraries/go`
50-
)
51-
52-
cy.visit('/me/home')
53-
cy.location('pathname').should('eq', `/orgs/${org.id}`)
54-
55-
cy.visit('/me/labels')
56-
cy.location('pathname').should('eq', `/orgs/${org.id}/settings/labels`)
57-
58-
cy.visit('/me/load-data')
59-
cy.location('pathname').should(
60-
'eq',
61-
`/orgs/${org.id}/load-data/sources`
62-
)
63-
64-
cy.visit('/me/nodejsclient')
65-
cy.location('pathname').should(
66-
'eq',
67-
`/orgs/${org.id}/load-data/client-libraries/javascript-node`
68-
)
69-
70-
cy.visit('/me/notebooks')
71-
cy.location('pathname').should('eq', `/orgs/${org.id}/notebooks`)
72-
73-
cy.visit('/me/pythonclient')
74-
cy.location('pathname').should(
75-
'eq',
76-
`/orgs/${org.id}/load-data/client-libraries/python`
77-
)
78-
79-
cy.visit('/me/secrets')
80-
cy.location('pathname').should('eq', `/orgs/${org.id}/settings/secrets`)
81-
82-
cy.visit('/me/setup-golang')
83-
cy.location('pathname').should(
84-
'eq',
85-
`/orgs/${org.id}/new-user-setup/golang`
86-
)
87-
88-
cy.visit('/me/setup-nodejs')
89-
cy.location('pathname').should(
90-
'eq',
91-
`/orgs/${org.id}/new-user-setup/nodejs`
92-
)
93-
94-
cy.visit('/me/setup-python')
95-
cy.location('pathname').should(
96-
'eq',
97-
`/orgs/${org.id}/new-user-setup/python`
98-
)
99-
100-
cy.visit('/me/tasks')
101-
cy.location('pathname').should('eq', `/orgs/${org.id}/tasks`)
102-
103-
cy.visit('/me/telegraf-mqtt')
104-
cy.location('pathname').should(
105-
'eq',
106-
`/orgs/${org.id}/load-data/telegraf-plugins/mqtt_consumer`
107-
)
108-
109-
cy.visit('/me/telegrafs')
110-
cy.location('pathname').should(
111-
'eq',
112-
`/orgs/${org.id}/load-data/telegrafs`
113-
)
114-
115-
cy.visit('/me/templates')
116-
cy.location('pathname').should(
117-
'eq',
118-
`/orgs/${org.id}/settings/templates`
119-
)
120-
121-
cy.visit('/me/tokens')
122-
cy.location('pathname').should('eq', `/orgs/${org.id}/load-data/tokens`)
123-
124-
cy.visit('/me/usage')
125-
cy.location('pathname').should('eq', `/orgs/${org.id}/usage`)
126-
127-
cy.visit('/me/users')
128-
cy.location('pathname').should('eq', `/orgs/${org.id}/users`)
129-
130-
cy.visit('/me/variables')
131-
cy.location('pathname').should(
132-
'eq',
133-
`/orgs/${org.id}/settings/variables`
134-
)
135-
})
15+
cy.wait(1000)
16+
cy.visit('/me/about')
17+
cy.location('pathname').should('eq', `/orgs/${org.id}/about`)
18+
19+
cy.visit('/me/alerts')
20+
cy.location('pathname').should('eq', `/orgs/${org.id}/alerting`)
21+
22+
cy.visit('/me/billing')
23+
cy.location('pathname').should('eq', `/orgs/${org.id}/billing`)
24+
25+
cy.visit('/me/buckets')
26+
cy.location('pathname').should('eq', `/orgs/${org.id}/load-data/buckets`)
27+
28+
cy.visit('/me/csharpclient')
29+
cy.location('pathname').should(
30+
'eq',
31+
`/orgs/${org.id}/load-data/client-libraries/csharp`
32+
)
33+
34+
cy.visit('/me/dashboards')
35+
cy.location('pathname').should('eq', `/orgs/${org.id}/dashboards-list`)
36+
37+
cy.visit('/me/data-explorer')
38+
cy.location('pathname').should('eq', `/orgs/${org.id}/data-explorer`)
39+
40+
cy.visit('/me/goclient')
41+
cy.location('pathname').should(
42+
'eq',
43+
`/orgs/${org.id}/load-data/client-libraries/go`
44+
)
45+
46+
cy.visit('/me/home')
47+
cy.location('pathname').should('eq', `/orgs/${org.id}`)
48+
49+
cy.visit('/me/labels')
50+
cy.location('pathname').should('eq', `/orgs/${org.id}/settings/labels`)
51+
52+
cy.visit('/me/load-data')
53+
cy.location('pathname').should('eq', `/orgs/${org.id}/load-data/sources`)
54+
55+
cy.visit('/me/nodejsclient')
56+
cy.location('pathname').should(
57+
'eq',
58+
`/orgs/${org.id}/load-data/client-libraries/javascript-node`
59+
)
60+
61+
cy.visit('/me/notebooks')
62+
cy.location('pathname').should('eq', `/orgs/${org.id}/notebooks`)
63+
64+
cy.visit('/me/pythonclient')
65+
cy.location('pathname').should(
66+
'eq',
67+
`/orgs/${org.id}/load-data/client-libraries/python`
68+
)
69+
70+
cy.visit('/me/secrets')
71+
cy.location('pathname').should('eq', `/orgs/${org.id}/settings/secrets`)
72+
73+
cy.visit('/me/setup-golang')
74+
cy.location('pathname').should(
75+
'eq',
76+
`/orgs/${org.id}/new-user-setup/golang`
77+
)
78+
79+
cy.visit('/me/setup-nodejs')
80+
cy.location('pathname').should(
81+
'eq',
82+
`/orgs/${org.id}/new-user-setup/nodejs`
83+
)
84+
85+
cy.visit('/me/setup-python')
86+
cy.location('pathname').should(
87+
'eq',
88+
`/orgs/${org.id}/new-user-setup/python`
89+
)
90+
91+
cy.visit('/me/tasks')
92+
cy.location('pathname').should('eq', `/orgs/${org.id}/tasks`)
93+
94+
cy.visit('/me/telegraf-mqtt')
95+
cy.location('pathname').should(
96+
'eq',
97+
`/orgs/${org.id}/load-data/telegraf-plugins/mqtt_consumer`
98+
)
99+
100+
cy.visit('/me/telegrafs')
101+
cy.location('pathname').should(
102+
'eq',
103+
`/orgs/${org.id}/load-data/telegrafs`
104+
)
105+
106+
cy.visit('/me/templates')
107+
cy.location('pathname').should('eq', `/orgs/${org.id}/settings/templates`)
108+
109+
cy.visit('/me/tokens')
110+
cy.location('pathname').should('eq', `/orgs/${org.id}/load-data/tokens`)
111+
112+
cy.visit('/me/usage')
113+
cy.location('pathname').should('eq', `/orgs/${org.id}/usage`)
114+
115+
cy.visit('/me/users')
116+
cy.location('pathname').should('eq', `/orgs/${org.id}/users`)
117+
118+
cy.visit('/me/variables')
119+
cy.location('pathname').should('eq', `/orgs/${org.id}/settings/variables`)
136120
})
137121
})
138122
})

‎src/shared/components/NotFound.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {getOrg} from 'src/organizations/selectors'
1919
import {getOrg as fetchOrg} from 'src/organizations/apis'
2020

2121
// Utils
22-
import {isFlagEnabled} from 'src/shared/utils/featureFlag'
2322
import {buildDeepLinkingMap} from 'src/utils/deepLinks'
2423
import {event} from 'src/cloud/utils/reporting'
2524

@@ -149,9 +148,7 @@ const NotFound: FC = () => {
149148
}, [history, location.pathname])
150149

151150
useEffect(() => {
152-
if (isFlagEnabled('deepLinking')) {
153-
handleDeepLink()
154-
}
151+
handleDeepLink()
155152
}, [handleDeepLink])
156153

157154
if (isFetchingOrg) {

0 commit comments

Comments
 (0)