removed unused endpoint and renamed macros

Author: charlottekostelic

overload_web/presentation/routers/files.py

@@ -41,13 +41,3 @@ def list_remote_files(
         name="forms/remote_list.html",
         context={"files": files, "vendor": vendor},
     )
-
-
-@api_router.get("/source", response_class=HTMLResponse)
-def get_file_source(request: Request, file_source: str) -> HTMLResponse:
-    """Render the file input partial within the file_source block"""
-    return request.app.state.templates.TemplateResponse(
-        request=request,
-        name="forms/file_input.html",
-        context={"file_source": file_source},
-    )

overload_web/templates/forms/collection_context.html

@@ -5,6 +5,6 @@ <h4>{{ context_fields["collection"]['options'][collection] }}</h4>
   </div>
 {% else %}
   <div id="collection_display" hx-swap-oob="true"></div>
-  {{ macro.collection_form_field("collection", context_fields["collection"],
+  {{ macro.collection_field("collection", context_fields["collection"],
     disabled=disabled) }}
 {% endif %}

overload_web/templates/forms/file_input.html

@@ -11,5 +11,5 @@
 {% else %}
   <div id="library-img" hx-swap-oob="true"></div>
 {% endif %}
-{{ macro.collection_form_field("collection", context_fields["collection"],
+{{ macro.collection_field("collection", context_fields["collection"],
 disabled=disabled) }}

overload_web/templates/forms/library_context.html

@@ -10,7 +10,7 @@
             </div>
             <div class="col" id="collection_wrapper">
               {% block collection_wrapper %}
-                {{ macro.collection_form_field("collection", context_fields["collection"], disabled=False) }}
+                {{ macro.collection_field("collection", context_fields["collection"], disabled=False) }}
               {% endblock %}
             </div>
             <div class="col" id="record_type_wrapper">

overload_web/templates/pvf_partials/context_source.html

@@ -1,4 +1,4 @@
-{% macro collection_form_field(field_id, data, disabled=False, display_value="") %}
+{% macro collection_field(field_id, data, disabled=False, display_value="") %}
   <div class="form-floating">
     {% if disabled %}
       <select id="{{ field_id }}"
@@ -124,3 +124,15 @@ <h4 class="card-title">{{ title }}</h4>
     </div>
   </div>
 {% endmacro %}
+{% macro card(title=None) %}
+  <div class="card h-100 shadow-sm rounded-3">
+    {% if title %}
+      <div class="card-body">
+        <h5 class="card-title">{{ title }}</h5>
+        {{ caller() }}
+      </div>
+    {% else %}
+      {{ caller() }}
+    {% endif %}
+  </div>
+{% endmacro %}

overload_web/templates/pvf_partials/macros.html

@@ -96,15 +96,6 @@ def test_files_router_list_remote_files_get(self):
         )
         assert response.context["files"] == ["foo.mrc"]
 
-    @pytest.mark.parametrize("source", ["local", "remote"])
-    def test_files_router_get_file_source(self, source):
-        response = self.client.get(f"/files/source?file_source={source}")
-        assert response.status_code == 200
-        assert response.url == f"{self.base_url}/files/source?file_source={source}"
-        assert sorted(list(response.context.keys())) == sorted(
-            ["file_source", "request"]
-        )
-
     def test_frontend_root_get(self):
         routes = self.client.app.router.__dict__["routes"]
         route_names = [i.name for i in routes]