Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

variantTopicId cleanup #12348

Merged
merged 2 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cypress/e2e/pages/topicPage/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import idSanitiser from '../../../../src/app/lib/utilities/idSanitiser';

export default ({ service, pageType, variant, currentPath }) => {
let topicId;
let variantTopicId;
let topicTitle;
let firstItemHeadline;
let pageCount;
Expand Down Expand Up @@ -270,7 +269,7 @@ export default ({ service, pageType, variant, currentPath }) => {
// URL contains correct variant after click
cy.url().should('contain', otherVariant);
// URL contains the correct topic ID
cy.url().should('contain', variantTopicId);
cy.url().should('contain', topicId);
// clicks script switch
cy.get(`[data-variant="${variant}"]`).click();
// URL contains correct variant after click
Expand Down
3 changes: 1 addition & 2 deletions data/arabic/topics/cng9qem66p5t.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@
}
],
"activePage": 1,
"pageCount": 1,
"variantTopicId": null
"pageCount": 1
},
"contentType": "application/json; charset=utf-8"
}
1 change: 0 additions & 1 deletion data/kyrgyz/topics/cvpv9djp9qqt.json
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,6 @@
],
"activePage": 1,
"pageCount": 1,
"variantTopicId": null,
"metadata": {
"analytics": {
"name": "kyrgyz.topics.cvpv9djp9qqt.page",
Expand Down
3 changes: 1 addition & 2 deletions data/mundo/topics/c1en6xwmpkvt.json
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,7 @@
}
],
"activePage": 1,
"pageCount": 1,
"variantTopicId": null
"pageCount": 1
},
"contentType": "application/json; charset=utf-8"
}
591 changes: 295 additions & 296 deletions data/mundo/topics/c7zp57yyz25t.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion data/mundo/topics/cw90edn9kw4t.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
],
"activePage": 1,
"pageCount": 1,
"variantTopicId": null,
"metadata": {
"analytics": {
"name": "mundo.topics.cw90edn9kw4t.page",
Expand Down
2 changes: 1 addition & 1 deletion data/persian/topics/crezq2dg9zwt.json
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
],
"activePage": 1,
"pageCount": 1,
"variantTopicId": null,
"": null,
amoore108 marked this conversation as resolved.
Show resolved Hide resolved
"metadata": {
"analytics": {
"name": "persian.topics.crezq2dg9zwt.page",
Expand Down
3 changes: 1 addition & 2 deletions data/persian/topics/cyy2zqnqn67t.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@
}
],
"activePage": 1,
"pageCount": 1,
"variantTopicId": null
"pageCount": 1
},
"contentType": "application/json; charset=utf-8"
}
1 change: 0 additions & 1 deletion data/pidgin/topics/c95y35941vrt.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@
],
"activePage": 1,
"pageCount": 7,
"variantTopicId": null,
"metadata": {
"analytics": {
"name": "pidgin.topics.c95y35941vrt.page",
Expand Down
3 changes: 1 addition & 2 deletions data/tamil/topics/c03dm2xmzzpt.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@
}
],
"activePage": 1,
"pageCount": 1,
"variantTopicId": null
"pageCount": 1
},
"contentType": "application/json; charset=utf-8"
}
2 changes: 0 additions & 2 deletions src/app/pages/TopicPage/fixtures.js
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ export const pidginSingleCurationEmptyStringSubheading = {
],
activePage: 1,
pageCount: 5,
variantTopicId: null,
metadata: {
analytics: {
name: 'pidgin.topics.c3l19z3k1ert.page',
Expand Down Expand Up @@ -631,7 +630,6 @@ export const mundoMultipleCurations = {
],
activePage: null,
pageCount: null,
variantTopicId: null,
contentType: 'application/json; charset=utf-8',
};

Expand Down
2 changes: 0 additions & 2 deletions src/app/routes/topic/getInitialData/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@ const topicJSON = {
],
activePage: 1,
pageCount: 14,
variantTopicId: null,
},
],
activePage: 1,
pageCount: 14,
variantTopicId: null,
metadata: {
type: 'Topic',
analytics: {
Expand Down
Loading