Skip to content

Commit 453ebd0

Browse files
iyerrama29iyerrama29
committed
"type" key bugfix, bug and feature request templates issued
1 parent 575f279 commit 453ebd0

File tree

2 files changed

+99
-101
lines changed

2 files changed

+99
-101
lines changed

‎dist/util/index.js‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -113,66 +113,65 @@ exports.groupItems = (items) => {
113113
*/
114114
exports.formatItems = (items, config) => {
115115
const time = new Date().toISOString();
116-
items.forEach((item) => {
117-
switch (item.type) {
116+
for (let i = 0, j = items.length; i < j; i++) {
117+
switch (items[i].type) {
118118
case 'asset_published':
119-
item._content_type_uid = formattedAssetType;
120-
item._type = config.contentstack.actions.publish;
119+
delete items[i].type;
120+
items[i]._content_type_uid = formattedAssetType;
121+
items[i]._type = config.contentstack.actions.publish;
121122
// extra keys
122-
item._synced_at = time;
123-
item = lodash_1.merge(item, item.data);
124-
item.locale = item.data.publish_details.locale;
125-
// delete item.data
126-
// delete item.content_type_uid
123+
items[i]._synced_at = time;
124+
items[i] = lodash_1.merge(items[i], items[i].data);
125+
items[i].locale = items[i].data.publish_details.locale;
127126
break;
128127
case 'asset_unpublished':
129-
item._content_type_uid = formattedAssetType;
130-
item._type = config.contentstack.actions.unpublish;
131-
item = lodash_1.merge(item, item.data);
132-
// delete item.data
133-
// delete item.content_type_uid
128+
delete items[i].type;
129+
items[i]._content_type_uid = formattedAssetType;
130+
items[i]._type = config.contentstack.actions.unpublish;
131+
items[i] = lodash_1.merge(items[i], items[i].data);
134132
break;
135133
case 'asset_deleted':
136-
item._content_type_uid = formattedAssetType;
137-
item._type = config.contentstack.actions.delete;
138-
item = lodash_1.merge(item, item.data);
139-
// delete item.data
140-
// delete item.content_type_uid
134+
delete items[i].type;
135+
items[i]._content_type_uid = formattedAssetType;
136+
items[i]._type = config.contentstack.actions.delete;
137+
items[i] = lodash_1.merge(items[i], items[i].data);
141138
break;
142139
case 'entry_published':
143-
item._type = config.contentstack.actions.publish;
144-
item._content_type_uid = item.content_type_uid;
140+
delete items[i].type;
141+
items[i]._type = config.contentstack.actions.publish;
142+
items[i]._content_type_uid = items[i].content_type_uid;
145143
// extra keys
146-
item._synced_at = time;
147-
item = lodash_1.merge(item, item.data);
148-
item.locale = item.data.publish_details.locale;
149-
// delete item.data
150-
// delete item.content_type_uid
144+
items[i]._synced_at = time;
145+
items[i] = lodash_1.merge(items[i], items[i].data);
146+
items[i].locale = items[i].data.publish_details.locale;
151147
break;
152148
case 'entry_unpublished':
153-
item._content_type_uid = item.content_type_uid;
154-
item._type = config.contentstack.actions.unpublish;
155-
item = lodash_1.merge(item, item.data);
156-
// delete item.data
157-
// delete item.content_type_uid
149+
delete items[i].type;
150+
items[i]._content_type_uid = items[i].content_type_uid;
151+
items[i]._type = config.contentstack.actions.unpublish;
152+
items[i] = lodash_1.merge(items[i], items[i].data);
158153
break;
159154
case 'entry_deleted':
160-
item._content_type_uid = item.content_type_uid;
161-
item._type = config.contentstack.actions.delete;
162-
item = lodash_1.merge(item, item.data);
163-
// delete item.data
164-
// delete item.content_type_uid
155+
delete items[i].type;
156+
items[i]._content_type_uid = items[i].content_type_uid;
157+
items[i]._type = config.contentstack.actions.delete;
158+
items[i] = lodash_1.merge(items[i], items[i].data);
165159
break;
166160
case 'content_type_deleted':
167-
item._type = config.contentstack.actions.delete;
168-
item.uid = item.content_type_uid;
169-
item._content_type_uid = formattedContentType;
170-
// delete item.content_type_uid
161+
delete items[i].type;
162+
items[i]._type = config.contentstack.actions.delete;
163+
items[i].uid = items[i].content_type_uid;
164+
items[i]._content_type_uid = formattedContentType;
171165
break;
172166
default:
167+
logger_1.logger.error('Item\'s type did not match any expected case!!');
168+
logger_1.logger.error(JSON.stringify(items[i]));
169+
// remove the element from items[i]s
170+
items[i].splice(i, 1);
171+
i--;
173172
break;
174173
}
175-
});
174+
}
176175
return items;
177176
};
178177
/**

‎src/util/index.ts‎

Lines changed: 59 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -135,66 +135,65 @@ export const groupItems = (items) => {
135135
*/
136136
export const formatItems = (items, config) => {
137137
const time = new Date().toISOString()
138-
items.forEach((item) => {
139-
switch (item.type) {
140-
case 'asset_published':
141-
item._content_type_uid = formattedAssetType
142-
item._type = config.contentstack.actions.publish
143-
// extra keys
144-
item._synced_at = time
145-
item = merge(item, item.data)
146-
item.locale = item.data.publish_details.locale
147-
// delete item.data
148-
// delete item.content_type_uid
149-
break
150-
case 'asset_unpublished':
151-
item._content_type_uid = formattedAssetType
152-
item._type = config.contentstack.actions.unpublish
153-
item = merge(item, item.data)
154-
// delete item.data
155-
// delete item.content_type_uid
156-
break
157-
case 'asset_deleted':
158-
item._content_type_uid = formattedAssetType
159-
item._type = config.contentstack.actions.delete
160-
item = merge(item, item.data)
161-
// delete item.data
162-
// delete item.content_type_uid
163-
break
164-
case 'entry_published':
165-
item._type = config.contentstack.actions.publish
166-
item._content_type_uid = item.content_type_uid
167-
// extra keys
168-
item._synced_at = time
169-
item = merge(item, item.data)
170-
item.locale = item.data.publish_details.locale
171-
// delete item.data
172-
// delete item.content_type_uid
173-
break
174-
case 'entry_unpublished':
175-
item._content_type_uid = item.content_type_uid
176-
item._type = config.contentstack.actions.unpublish
177-
item = merge(item, item.data)
178-
// delete item.data
179-
// delete item.content_type_uid
180-
break
181-
case 'entry_deleted':
182-
item._content_type_uid = item.content_type_uid
183-
item._type = config.contentstack.actions.delete
184-
item = merge(item, item.data)
185-
// delete item.data
186-
// delete item.content_type_uid
187-
break
188-
case 'content_type_deleted':
189-
item._type = config.contentstack.actions.delete
190-
item.uid = item.content_type_uid
191-
item._content_type_uid = formattedContentType
192-
// delete item.content_type_uid
193-
break
194-
default:
195-
break
196-
}
197-
})
138+
for (let i = 0, j = items.length; i < j; i++) {
139+
switch (items[i].type) {
140+
case 'asset_published':
141+
delete items[i].type
142+
items[i]._content_type_uid = formattedAssetType
143+
items[i]._type = config.contentstack.actions.publish
144+
// extra keys
145+
items[i]._synced_at = time
146+
items[i] = merge(items[i], items[i].data)
147+
items[i].locale = items[i].data.publish_details.locale
148+
break
149+
case 'asset_unpublished':
150+
delete items[i].type
151+
items[i]._content_type_uid = formattedAssetType
152+
items[i]._type = config.contentstack.actions.unpublish
153+
items[i] = merge(items[i], items[i].data)
154+
break
155+
case 'asset_deleted':
156+
delete items[i].type
157+
items[i]._content_type_uid = formattedAssetType
158+
items[i]._type = config.contentstack.actions.delete
159+
items[i] = merge(items[i], items[i].data)
160+
break
161+
case 'entry_published':
162+
delete items[i].type
163+
items[i]._type = config.contentstack.actions.publish
164+
items[i]._content_type_uid = items[i].content_type_uid
165+
// extra keys
166+
items[i]._synced_at = time
167+
items[i] = merge(items[i], items[i].data)
168+
items[i].locale = items[i].data.publish_details.locale
169+
break
170+
case 'entry_unpublished':
171+
delete items[i].type
172+
items[i]._content_type_uid = items[i].content_type_uid
173+
items[i]._type = config.contentstack.actions.unpublish
174+
items[i] = merge(items[i], items[i].data)
175+
break
176+
case 'entry_deleted':
177+
delete items[i].type
178+
items[i]._content_type_uid = items[i].content_type_uid
179+
items[i]._type = config.contentstack.actions.delete
180+
items[i] = merge(items[i], items[i].data)
181+
break
182+
case 'content_type_deleted':
183+
delete items[i].type
184+
items[i]._type = config.contentstack.actions.delete
185+
items[i].uid = items[i].content_type_uid
186+
items[i]._content_type_uid = formattedContentType
187+
break
188+
default:
189+
logger.error('Item\'s type did not match any expected case!!')
190+
logger.error(JSON.stringify(items[i]))
191+
// remove the element from items[i]s
192+
items[i].splice(i, 1)
193+
i--
194+
break
195+
}
196+
}
198197

199198
return items
200199
}

0 commit comments

Comments
 (0)