Skip to content

Commit 730dae6

Browse files
committed
Revert "fix(items): add some fidelity to unresolved zombie items"
This reverts commit f1463bb.
1 parent f1463bb commit 730dae6

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

clients/web/src/common/api/derivers/item.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export function deriveItemData({
205205
authors: item?.preview?.authors || itemEnrichment?.authors || item?.authors || false,
206206
title: title({ item, itemEnrichment, node }),
207207
thumbnail: thumbnail({ item, itemEnrichment }),
208-
excerpt: excerpt({ item, itemEnrichment, node }),
208+
excerpt: excerpt({ item, itemEnrichment }),
209209
publisher: publisher({ item, itemEnrichment, passedPublisher }),
210210
publisherLogo: item?.domainMetadata?.logo || false,
211211
externalUrl: externalUrl({ item, itemEnrichment, utmId }),
@@ -302,13 +302,12 @@ function publisher({ item, itemEnrichment, passedPublisher }) {
302302
* @param {object} curatedInfo Additional information provided by the curation team
303303
* @returns {string} The most appropriate excerpt to show
304304
*/
305-
function excerpt({ item, itemEnrichment, node }) {
305+
function excerpt({ item, itemEnrichment }) {
306306
return (
307307
item?.preview?.excerpt ||
308308
itemEnrichment?.excerpt ||
309309
item?.collection?.excerpt ||
310310
item?.excerpt ||
311-
node?.url ||
312311
null
313312
)
314313
}

clients/web/src/common/api/derivers/list/image.spec.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ describe('Saves - Image', () => {
8888
'https://pocket-image-cache.com/600x/filters:format(jpg):extract_focal()/https%3A%2F%2Fcdn.dribbble.com%2Fusers%2F59947%2Fscreenshots%2F16700535%2Fmedia%2F335d386abb459f49570030e830429cef.jpg'
8989
)
9090
expect(item.publisher).toBe('cdn.dribbble.com')
91-
expect(item.excerpt).toBe(
92-
'https://cdn.dribbble.com/users/59947/screenshots/16700535/media/335d386abb459f49570030e830429cef.jpg'
93-
)
91+
expect(item.excerpt).toBeFalsy()
9492
expect(item.saveUrl).toBe(expectedSaveUrl)
9593
expect(item.externalUrl).toBe(expectedExternalUrl)
9694
expect(item.readUrl).toBe(expectedReadUrl)

clients/web/src/common/api/queries/get-saved-items.js

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ const getSavedItemsQuery = gql`
1717
edges {
1818
cursor
1919
node {
20-
nodeId: id
21-
url
22-
title
2320
_createdAt
2421
_updatedAt
2522
status

clients/web/src/connectors/items/items-saved.state.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function* savedItemRequest(action) {
9999
const savedItemIds = edges
100100
.filter(validateEdge)
101101
.filter(removeStarterArticle)
102-
.map((edge) => edge?.node?.item?.itemId ?? edge?.node?.nodeId)
102+
.map((edge) => edge?.node?.item?.itemId)
103103

104104
const nodes = edges.reduce(getNodeFromEdge, {})
105105
const itemsById = edges.reduce(getItemFromEdge, {})
@@ -207,30 +207,26 @@ const removeStarterArticle = (edge) => !STARTER_ARTICLES.includes(edge?.node?.it
207207
const getNodeFromEdge = (previous, current) => {
208208
const cursor = current.cursor
209209
const { item, ...node } = current.node
210-
const itemId = node?.item?.itemId ?? node?.nodeId
211210
if (node.status === 'DELETED') return previous // REMOVE DELETED ITEMS FROM THE RESPONSE
212-
return { ...previous, [itemId]: { cursor, ...node } }
211+
return { ...previous, [item.itemId]: { cursor, ...node } }
213212
}
214213

215214
const getItemFromEdge = (previous, current) => {
216215
const { item, node } = deriveSavedItem(current.node)
217-
const itemId = node?.item?.itemId ?? node?.nodeId
218216
if (node.status === 'DELETED') return previous
219-
return { ...previous, [itemId]: item } // REMOVE DELETED ITEMS FROM THE RESPONSE
217+
return { ...previous, [item.itemId]: item } // REMOVE DELETED ITEMS FROM THE RESPONSE
220218
}
221219

222220
const getSearchNodeFromEdge = (previous, current) => {
223221
const { item, ...node } = current.node.savedItem
224-
const itemId = node?.item?.itemId ?? node?.nodeId
225222
if (node.status === 'DELETED') return previous
226-
return { ...previous, [itemId]: node } // REMOVE DELETED ITEMS FROM THE RESPONSE
223+
return { ...previous, [item.itemId]: node } // REMOVE DELETED ITEMS FROM THE RESPONSE
227224
}
228225

229226
const getSearchItemFromEdge = (previous, current) => {
230227
const { item, node } = deriveSavedItem(current.node.savedItem)
231-
const itemId = node?.item?.itemId ?? node?.nodeId
232228
if (node.status === 'DELETED') return previous
233-
return { ...previous, [itemId]: item } // REMOVE DELETED ITEMS FROM THE RESPONSE
229+
return { ...previous, [item.itemId]: item } // REMOVE DELETED ITEMS FROM THE RESPONSE
234230
}
235231

236232
/**

0 commit comments

Comments
 (0)