From 2cff35c3f245ddd87ab39647d33886351c7c9ed3 Mon Sep 17 00:00:00 2001 From: efarooqui Date: Fri, 16 Oct 2020 11:23:00 -0700 Subject: [PATCH] Removed commented out logic --- src/actions/index.js | 10 +--------- src/components/presentational/Timeline/Events.js | 1 - src/reducers/validate/categorySchema.js | 9 --------- src/reducers/validate/validators.js | 4 ---- src/store/initial.js | 1 - 5 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 src/reducers/validate/categorySchema.js diff --git a/src/actions/index.js b/src/actions/index.js index 9d2b538..388ed8a 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -41,13 +41,7 @@ export function fetchDomain () { .catch(() => handleError('events')) ) ).then(results => results.flatMap(t => t)) - - // let catPromise = Promise.resolve([]) - // if (features.USE_CATEGORIES) { - // catPromise = fetch(CATEGORY_URL) - // .then(response => response.json()) - // .catch(() => handleError(domainMsg('categories'))) - // } + let associationsPromise = Promise.resolve([]) if (features.USE_ASSOCIATIONS) { @@ -87,7 +81,6 @@ export function fetchDomain () { return Promise.all([ eventPromise, - // catPromise, associationsPromise, sourcesPromise, sitesPromise, @@ -96,7 +89,6 @@ export function fetchDomain () { .then(response => { const result = { events: response[0], - // categories: response[1], associations: response[1], sources: response[2], sites: response[3], diff --git a/src/components/presentational/Timeline/Events.js b/src/components/presentational/Timeline/Events.js index b6b9fe1..af9ea59 100644 --- a/src/components/presentational/Timeline/Events.js +++ b/src/components/presentational/Timeline/Events.js @@ -148,7 +148,6 @@ const TimelineEvents = ({ > {renderProjects()} {events.reduce(renderEvent, [])} - {/* {events.map(event => renderEvent(event))} */} ) } diff --git a/src/reducers/validate/categorySchema.js b/src/reducers/validate/categorySchema.js deleted file mode 100644 index 4eb7bf4..0000000 --- a/src/reducers/validate/categorySchema.js +++ /dev/null @@ -1,9 +0,0 @@ -import Joi from 'joi' - -const categorySchema = Joi.object().keys({ - category: Joi.string().required(), - description: Joi.string(), - group: Joi.string() -}) - -export default categorySchema diff --git a/src/reducers/validate/validators.js b/src/reducers/validate/validators.js index a3fdfa0..a6c24c4 100644 --- a/src/reducers/validate/validators.js +++ b/src/reducers/validate/validators.js @@ -1,7 +1,6 @@ import Joi from 'joi' import createEventSchema from './eventSchema' -import categorySchema from './categorySchema' import siteSchema from './siteSchema' import associationsSchema from './associationsSchema' import sourceSchema from './sourceSchema' @@ -47,7 +46,6 @@ function findDuplicateAssociations (associations) { export function validateDomain (domain, features) { const sanitizedDomain = { events: [], - // categories: [], sites: [], associations: [], sources: {}, @@ -61,7 +59,6 @@ export function validateDomain (domain, features) { const discardedDomain = { events: [], - // categories: [], sites: [], associations: [], sources: [], @@ -110,7 +107,6 @@ export function validateDomain (domain, features) { const eventSchema = createEventSchema(features.CUSTOM_EVENT_FIELDS) validateArray(domain.events, 'events', eventSchema) - // validateArray(domain.categories, 'categories', categorySchema) validateArray(domain.sites, 'sites', siteSchema) validateArray(domain.associations, 'associations', associationsSchema) validateObject(domain.sources, 'sources', sourceSchema) diff --git a/src/store/initial.js b/src/store/initial.js index aa39e4f..2ed221d 100644 --- a/src/store/initial.js +++ b/src/store/initial.js @@ -12,7 +12,6 @@ const initial = { domain: { events: [], locations: [], - // categories: [], associations: [], sources: {}, sites: [],