From 9dbdef571db08b89c36b6557a67110ca0c9f1fb3 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Fri, 22 Jan 2021 20:00:31 -0600
Subject: [PATCH] Establish a "trim" setting just for pgwui_upload

---
 src/pgwui_upload/check_settings.py |  1 +
 src/pgwui_upload/pgwui_upload.py   |  9 ++++++++-
 src/pgwui_upload/views/upload.py   | 11 ++++-------
 tests/views/test_upload.py         |  5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/pgwui_upload/check_settings.py b/src/pgwui_upload/check_settings.py
index df90b69..04d8d5b 100644
--- a/src/pgwui_upload/check_settings.py
+++ b/src/pgwui_upload/check_settings.py
@@ -38,6 +38,7 @@ def check_settings(component_config):
         pgwui_upload_core.check_settings.UPLOAD_SETTINGS,
         pgwui_upload_core.check_settings.REQUIRED_SETTINGS,
         pgwui_upload_core.check_settings.BOOLEAN_SETTINGS,
+        pgwui_upload_core.check_settings.BOOLEAN_CHOICE_SETTINGS,
         component_config))
 
     return errors
diff --git a/src/pgwui_upload/pgwui_upload.py b/src/pgwui_upload/pgwui_upload.py
index b5fb682..c7d0a7a 100644
--- a/src/pgwui_upload/pgwui_upload.py
+++ b/src/pgwui_upload/pgwui_upload.py
@@ -24,6 +24,8 @@
 PGWUI_COMPONENT = 'pgwui_upload'
 DEFAULT_UPLOAD_ROUTE = '/upload'
 DEFAULT_UPLOAD_MENU_LABEL = 'upload -- Upload File Into Database'
+DEFAULT_LITERAL_COLUMN_HEADINGS = 'off'
+DEFAULT_TRIM = 'choice-yes'
 
 
 def init_menu(config):
@@ -32,8 +34,13 @@ def init_menu(config):
     settings = config.get_settings()
     pgwui = settings.setdefault('pgwui', dict())
     pgwui.setdefault(PGWUI_COMPONENT, dict())
-    pgwui[PGWUI_COMPONENT].setdefault(
+    upload_settings = pgwui[PGWUI_COMPONENT]
+    upload_settings.setdefault(
         'menu_label', DEFAULT_UPLOAD_MENU_LABEL)
+    upload_settings.setdefault(
+        'literal_column_headings', DEFAULT_LITERAL_COLUMN_HEADINGS)
+    upload_settings.setdefault(
+        'trim', DEFAULT_TRIM)
 
 
 def includeme(config):
diff --git a/src/pgwui_upload/views/upload.py b/src/pgwui_upload/views/upload.py
index cda3215..c17b31a 100644
--- a/src/pgwui_upload/views/upload.py
+++ b/src/pgwui_upload/views/upload.py
@@ -43,7 +43,9 @@ from pgwui_core.core import (
     is_checked,
 )
 from pgwui_upload_core.views.upload import (
+    UploadCoreInitialPost,
     BaseTableUploadHandler,
+    set_upload_response,
 )
 
 from pgwui_upload import exceptions as upload_ex
@@ -86,7 +88,7 @@ class TableUploadHandler(BaseTableUploadHandler):
         '''
         Make the upload form needed by this handler.
         '''
-        return UploadDoubleTableForm(self)
+        return UploadDoubleTableForm().build(self, ip=UploadCoreInitialPost())
 
     def get_data(self):
         '''
@@ -170,12 +172,7 @@ def upload_view(request):
     tuh = TableUploadHandler(request).init()
     response = UploadEngine(tuh).run()
 
-    settings = request.registry.settings
-    quoter_setting = settings['pgwui'].get('literal_column_headings')
-    response['ask_about_literal_cols'] = quoter_setting == 'ask'
-    # Keep these next 2
-    response.setdefault('pgwui', dict())
-    response['pgwui']['pgwui_upload'] = settings['pgwui']['pgwui_upload']
+    set_upload_response('pgwui_upload', request, response)
 
     if response['db_changed']:
         log_success(response)
diff --git a/tests/views/test_upload.py b/tests/views/test_upload.py
index 99607a8..6798c4a 100644
--- a/tests/views/test_upload.py
+++ b/tests/views/test_upload.py
@@ -200,7 +200,8 @@ def test_upload_view_literal_cols_ask(undecorate, mock_log_success):
     undecorate(response)
 
     settings = get_current_request().registry.settings
-    settings['pgwui'].update({'literal_column_headings': 'ask'})
+    settings['pgwui']['pgwui_upload'].update(
+        {'literal_column_headings': 'ask'})
 
     result = upload.upload_view(get_current_request())
 
@@ -214,7 +215,7 @@ def test_upload_view_literal_cols_noask(undecorate, mock_log_success):
     undecorate(response)
 
     settings = get_current_registry().settings
-    settings['pgwui'].update({'literal_column_headings': 'no'})
+    settings['pgwui']['pgwui_upload'].update({'literal_column_headings': 'no'})
 
     result = upload.upload_view(get_current_request())
 
-- 
2.34.1