dropping unneeded components

Author: ddooley

lib/utils/templates.js

@@ -1,6 +1,5 @@
 import { deepMerge } from './objects';
 import { fetchFileAsync } from './files';
-//import template_manifest from '../../web/templates/manifest.json';
 import { menu, getSchema } from 'schemas';
 
 
@@ -24,28 +23,12 @@ export function getTemplatePathInScope() {
   return templatePath;
 }
 
-const isSchema = (el) => el.name === 'schema.json';
-const isLocale = (el) => el.name === 'locales';
-
 const schemaFromChildPath = (childPath) =>
   childPath.replace(/\/templates\/(.+)\/schema.json/, '$1');
 
-// Actually this is accessSchema - and not language variant.
-
-// Returns default template built from schema 
-export async function accessTemplate(schema_folder) { // e.g. canada_covid19
-
-  const template = template_manifest.children.find(
-    (el) => el.name === schema_folder
-  );
-  console.log("template from manifest", template)
-  return template ? processNode(template) : null;
-}
-
 // Returns default template built from schema 
 async function compileSchema(schema_folder) { // e.g. canada_covid19
 
-  //////////////////////////////////////////////////
   for (const [schema_name, schema_obj] of Object.entries(menu)) {
     if (schema_obj.folder === schema_folder) {
       var schema = await fetchSchema(`/templates/${schema_folder}/schema.json`);
@@ -86,134 +69,6 @@ async function fetchSchema(path) {
   return null;
 
 }
-/*
-// processNode() only used here.
-async function processNode(node) {
-  const { name, children } = node;
-
-  // Base case
-  if (!children || children.length === 0) {
-    return [];
-  }
-
-  let schema = [];
-  let locales = [];
-
-  await Promise.all(
-    children.map(async (child) => {
-      if (isSchema(child)) {
-        let schemaData = null;
-        // Running locally so get schema from schemas.json
-        if (window.location.protocol.startsWith('file')) {
-          // child.path e.g. /templates/SDRF/schema.json
-          schemaData = await getSchema(schemaFromChildPath(child.path));
-        } else if (window.location.protocol.startsWith('http')) {
-          schemaData = await fetchFileAsync(child.path);
-        }
-
-        schema.push(schemaData);
-      } else if (isLocale(child)) {
-        const processedLocale = await processNode(child);
-        if (processedLocale.length) {
-          locales.push(processedLocale);
-        }
-      } 
-      else {
-        const processedChild = await processNode(child);
-        // CRITICAL FOR LOCAL HIERARCHY SCAN
-        if (processedChild.length) {
-          locales.push(processedChild);
-        }
-      }
-    })
-  );
-
-  const folded_template_spec = [name, [schema], locales];
-  console.log(folded_template_spec);
-  return folded_template_spec;
-}
-
-// This returns template from input [[][][]]; and nothing else
-export function buildTemplate(input) {
-  // Check if the input format is correct
-  if (!Array.isArray(input) || input.length !== 3) {
-    throw new Error('Invalid input format. Expected an array of 3 elements.');
-  }
-
-  let [name, innerArray, childFolders] = input;
-
-  // Check the innerArray format
-  if (!Array.isArray(innerArray) || innerArray.length !== 1) {
-    throw new Error(
-      'Invalid format for the second parameter. Expected an array of 2 elements.'
-    );
-  }
-
-  const [schemas] = innerArray;
-
-  if (!Array.isArray(schemas)) {
-    throw new Error('Schemas must be arrays.');
-  }
-
-  const schema = schemas[0];
-
-  if (!Array.isArray(childFolders) || childFolders.length === 0) {
-    childFolders = [[], [], []];
-  }
-
-  const locales_folder = childFolders.filter((ln) => ln[0] === 'locales')[0];
-  let locales = [];
-  if (typeof locales_folder !== 'undefined') {
-    try {
-      if (Array.isArray(locales_folder) && locales_folder.length > 2) {
-        locales = locales_folder[2];
-      } else {
-        throw new Error(
-          'locales_folder is not an array or does not have enough elements.'
-        );
-      }
-    } catch (err) {
-      throw new Error(`Error extracting locales from childFolders: ${err}`);
-    }
-
-    if (!Array.isArray(locales)) {
-      throw new Error('Locales is not an array.');
-    }
-  }
-
-  let template = {
-    name,
-    default: {
-      schema
-    },
-    locales: {},
-  };
-
-  try {
-    template.locales = locales.reduce((acc, localization) => {
-      if (!Array.isArray(localization) || localization.length < 3) {
-        throw new Error(
-          'Invalid localization format. Expected an array with at least 3 elements.'
-        );
-      }
-      const locale_label = localization[0];
-      const schemaMerge =
-        localization[1][0] && localization[1][0][0]
-          ? deepMerge(schemas[0], localization[1][0][0])
-          : null;
-      return Object.assign(acc, {
-        [locale_label]: {
-          schema: schemaMerge
-        },
-      });
-    }, {});
-  } catch (err) {
-    throw new Error('Error processing locales. ' + err.message);
-  }
-
-  return template;
-}
-*/
 
 //Used only in this script in create()
 function buildTemplateFromUploadedSchema(schema) {
@@ -312,16 +167,13 @@ class TemplateProxy {
 
     let template;
     if (forced_schema !== null) {
-      // returns {name:..., default: {schema}, locales: {[locale]:{ schema}}}
       template = buildTemplateFromUploadedSchema(forced_schema);
     } else {
-      // access schema_folder from directory in the manifest
-      //const fetchedTemplateData = await accessTemplate(schema_folder);
-      //template = buildTemplate(fetchedTemplateData);
-
+      // Access schema_folder via menu content
       template = await compileSchema(schema_folder);
     }
 
+    // template = {name:..., default: {schema}, locales: {[locale]:{ schema}}}
     await instance._init(template, locale);
 
     // NOTE: Why Proxy? it allows us to call all of the template's properties in an "inherited" fashion
@@ -490,7 +342,5 @@ export const Template = TemplateProxy;
 export default {
   TemplateProxy,
   Template,
-  //accessTemplate,
-  //buildTemplate,
   findBestLocaleMatch,
 };

web/webpack.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
-const DirectoryTreePlugin = require('directory-tree-webpack-plugin');
+//const DirectoryTreePlugin = require('directory-tree-webpack-plugin');
 
 module.exports = (env, argv) => {
   var config = {