Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
16 changes: 0 additions & 16 deletions dotcom-rendering/src/server/handler.article.web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,6 @@ export const handleArticle: RequestHandler = ({ body }, res) => {
res.status(200).set('Link', makePrefetchHeader(prefetchScripts)).send(html);
};

export const handleArticleJson: RequestHandler = ({ body }, res) => {
recordTypeAndPlatform('article', 'json');

const frontendData = validateAsFEArticle(body);
const article = enhanceArticleType(frontendData, 'Web');
const resp = {
data: {
// TODO: We should rename this to 'article' or 'FEArticle', but first we need to investigate
// where/if this is used.
CAPIArticle: article,
},
};

res.status(200).send(resp);
};

export const handleInteractive: RequestHandler = ({ body }, res) => {
recordTypeAndPlatform('interactive', 'web');

Expand Down
8 changes: 0 additions & 8 deletions dotcom-rendering/src/server/handler.front.web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,6 @@ export const handleFront: RequestHandler = ({ body }, res) => {
res.status(200).set('Link', makePrefetchHeader(prefetchScripts)).send(html);
};

export const handleFrontJson: RequestHandler = ({ body }, res) => {
res.json(enhanceFront(body));
};

export const handleTagPage: RequestHandler = ({ body }, res) => {
recordTypeAndPlatform('tagPage');
const tagPage = enhanceTagPage(body);
Expand All @@ -157,7 +153,3 @@ export const handleTagPage: RequestHandler = ({ body }, res) => {
});
res.status(200).set('Link', makePrefetchHeader(prefetchScripts)).send(html);
};

export const handleTagPageJson: RequestHandler = ({ body }, res) => {
res.json(enhanceTagPage(body));
};
14 changes: 1 addition & 13 deletions dotcom-rendering/src/server/server.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@ import {
} from './handler.article.apps';
import {
handleArticle,
handleArticleJson,
handleBlocks,
handleInteractive,
} from './handler.article.web';
import { handleEditionsCrossword } from './handler.editionsCrossword';
import {
handleFront,
handleFrontJson,
handleTagPage,
handleTagPageJson,
} from './handler.front.web';
import { handleFront, handleTagPage } from './handler.front.web';
import {
handleCricketMatchPage,
handleFootballMatchListPage,
Expand Down Expand Up @@ -97,15 +91,12 @@ const renderer = Router();
// URL if req.params.url is present
renderer.use(getContentFromURLMiddleware);
renderer.get('/Article/*url', handleArticle);
renderer.get('/ArticleJson/*url', handleArticleJson);
renderer.get('/AMPArticle/*url', handleAMPArticle);
renderer.get('/Interactive/*url', handleInteractive);
renderer.get('/AMPInteractive/*url', handleAMPArticle);
renderer.get('/Blocks/*url', handleBlocks);
renderer.get('/Front/*url', handleFront);
renderer.get('/FrontJSON/*url', handleFrontJson);
renderer.get('/TagPage/*url', handleTagPage);
renderer.get('/TagPageJSON/*url', handleTagPageJson);
renderer.get('/EmailNewsletters/*url', handleAllEditorialNewslettersPage);
renderer.get('/AppsArticle/*url', handleAppsArticle);
renderer.get('/AppsInteractive/*url', handleAppsInteractive);
Expand All @@ -117,15 +108,12 @@ renderer.get('/CricketMatchPage/*url', handleCricketMatchPage);
renderer.get('/FootballMatchSummaryPage/*url', handleFootballMatchPage);
// POST routes for running frontend locally
renderer.post('/Article', handleArticle);
renderer.post('/ArticleJson', handleArticleJson);
renderer.post('/AMPArticle', handleAMPArticle);
renderer.post('/Interactive', handleInteractive);
renderer.post('/AMPInteractive', handleAMPArticle);
renderer.post('/Blocks', handleBlocks);
renderer.post('/Front', handleFront);
renderer.post('/FrontJSON', handleFrontJson);
renderer.post('/TagPage', handleTagPage);
renderer.post('/TagPageJSON', handleTagPageJson);
renderer.post('/EmailNewsletters', handleAllEditorialNewslettersPage);
renderer.post('/AppsArticle', handleAppsArticle);
renderer.post('/AppsInteractive', handleAppsInteractive);
Expand Down
23 changes: 1 addition & 22 deletions dotcom-rendering/src/server/server.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,11 @@ import {
} from './handler.article.apps';
import {
handleArticle,
handleArticleJson,
handleBlocks,
handleInteractive,
} from './handler.article.web';
import { handleEditionsCrossword } from './handler.editionsCrossword';
import {
handleFront,
handleFrontJson,
handleTagPage,
handleTagPageJson,
} from './handler.front.web';
import { handleFront, handleTagPage } from './handler.front.web';
import {
handleCricketMatchPage,
handleFootballMatchListPage,
Expand Down Expand Up @@ -71,9 +65,7 @@ export const prodServer = (): void => {
app.post('/AMPInteractive', logRenderTime, handleAMPArticle);
app.post('/Blocks', logRenderTime, handleBlocks);
app.post('/Front', logRenderTime, handleFront);
app.post('/FrontJSON', logRenderTime, handleFrontJson);
app.post('/TagPage', logRenderTime, handleTagPage);
app.post('/TagPageJSON', logRenderTime, handleTagPageJson);
app.post(
'/FootballMatchListPage',
logRenderTime,
Expand Down Expand Up @@ -104,7 +96,6 @@ export const prodServer = (): void => {
getContentFromURLMiddleware,
handleArticle,
);
app.use('/ArticleJson/*url', handleArticleJson);

app.get(
'/AMPArticle/*url',
Expand All @@ -119,25 +110,13 @@ export const prodServer = (): void => {
getContentFromURLMiddleware,
handleFront,
);
app.get(
'/FrontJSON/*url',
logRenderTime,
getContentFromURLMiddleware,
handleFrontJson,
);

app.get(
'/TagPage/*url',
logRenderTime,
getContentFromURLMiddleware,
handleTagPage,
);
app.get(
'/TagPageJSON/*url',
logRenderTime,
getContentFromURLMiddleware,
handleTagPageJson,
);

app.get(
'/EmailNewsletters',
Expand Down