refactoring downloads

Author: githubering182

backend-app/archive/models.py

@@ -6,7 +6,8 @@
     DO_NOTHING,
     DateTimeField,
     IntegerField,
-    JSONField
+    JSONField,
+    TextField
 )
 
 
@@ -16,6 +17,7 @@ class Archive(Model):
     id = CharField(max_length=36, primary_key=True)
     result_id = CharField(max_length=24, null=True)
     result_size = IntegerField(null=True)
+    result_message = TextField(null=True)
     status = CharField(max_length=1, choices=STATUSES, default="p")
     filters = JSONField()
     create_date = DateTimeField(auto_now_add=True)

backend-app/archive/serializers.py

@@ -1,4 +1,4 @@
-from rest_framework.serializers import ModelSerializer, ChoiceField
+from rest_framework.serializers import ModelSerializer, ChoiceField, SerializerMethodField
 from .models import Archive
 
 
@@ -8,7 +8,10 @@ def to_representation(self, value: str) -> str: return self.choices[value]
 
 class ArchiveSerializer(ModelSerializer):
     status = StatusChoiceField(choices=Archive.STATUSES)
+    author = SerializerMethodField()
 
     class Meta:
         model = Archive
-        fields = ("id", "result_id", "result_size", "status",)
+        exclude = ("file", "project")
+
+    def get_author(self, instance: Archive): return instance.author.username

backend-app/archive/services.py

@@ -16,7 +16,7 @@
 from django.db import transaction
 
 
-@with_model_assertion(Project, "id", filter={"visible": True},)
+@with_model_assertion(Project, "id", filter={"visible": True}, class_based=False)
 def _get_archives(project: Project) -> tuple[dict[str, Any], int]:
     query = project.archive_set \
         .annotate(file_count=Count("file")) \
@@ -26,34 +26,43 @@ def _get_archives(project: Project) -> tuple[dict[str, Any], int]:
 
 @with_model_assertion(Project, "id", filter={"visible": True}, class_based=False)
 def _make_archive(project: Project, request: Request) -> tuple[dict[str, Any], int]:
-    request_data: dict[str, Any] = request.data
+    request_query = type(
+        "query",
+        (object,),
+        {
+            "get": lambda *a: request.data.get(a[0], a[1] if len(a) > 1 else None),
+            "getlist": lambda *a: request.data.get(a[0], a[1] if len(a) > 1 else []),
+        }
+    )
 
     attributes = project.attribute_set \
-        .filter(id__in=request_data.get("attr", [])) \
+        .filter(id__in=request_query.get("attr", [])) \
         .order_by("level__order", "id") \
         .values("name") \
         .values_list("name", flat=True)
 
     filter_data = {
-        "status": request_data.get("card", []),
-        "only_new": request_data.get("downloaded", False),
-        "type": request_data.get("type", []),
+        "status": request_query.get("card", []),
+        "only_new": request_query.get("downloaded", False),
+        "type": request_query.get("type", []),
         "attributes": list(attributes)
     }
 
-    files, _ = FileService()._get_files(project.id, request.user, request_data, True)
+    files, _ = FileService()._get_files(project.id, request.user, request_query, True)
 
-    response = post(
-        "url",
-        headers={
-            "Authorization": "Bearer " + request.user._make_token(),
-            "Content-Type": "application/json",
-        },
-        json=FileSerializer(files, many=True).data
-    )
+    # response = post(
+    #     "url",
+    #     headers={
+    #         "Authorization": "Bearer " + request.user._make_token(),
+    #         "Content-Type": "application/json",
+    #     },
+    #     json=FileSerializer(files, many=True).data
+    # )
 
-    assert response.status_code == 201
-    assert (task_id := response.json().get("task_id"))
+    # assert response.status_code == 201
+    # assert (task_id := response.json().get("task_id"))
+    from secrets import token_hex
+    task_id = token_hex(16)
 
     with transaction.atomic():
         archive = project.archive_set.create(
@@ -63,6 +72,6 @@ def _make_archive(project: Project, request: Request) -> tuple[dict[str, Any], i
         )
 
         files.update(is_downloaded=True)
-        archive.add(*files)
+        archive.file.add(*files)
 
     return ArchiveSerializer(archive).data, 201

backend-app/proj_back/settings.py

@@ -136,6 +136,7 @@
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 1000
 
 REST_FRAMEWORK = {
+    'DATETIME_FORMAT': '%Y-%m-%d %H:%M',
     'DEFAULT_PERMISSION_CLASSES': (
         'rest_framework.permissions.IsAuthenticated',
     ),

frontend-app/src/adapters/index.js

@@ -1,5 +1,51 @@
 import { deepCopy, extractFileMeta, formUID } from "../utils";
 
+/**
+* @param {object} data
+* @returns {string}
+*/
+export const formatFilterJSON = (data) => {
+  var res = "";
+
+  for (let key in data) {
+    var val = data[key];
+    var skipKey = false;
+    var addValue;
+
+    switch (typeof val) {
+      case "boolean": {
+        skipKey = !val;
+        break;
+      }
+      case "object": {
+        if (Array.isArray(val)) {
+          if (val.length) {
+            addValue = "[";
+            for (let v of val) { addValue += v; addValue += ", "; }
+            addValue = addValue.slice(0, addValue.length - 2);
+            addValue += "]";
+          }
+          else addValue = "all";
+        }
+        else addValue = formatFilterJSON(val);
+        break;
+      }
+      default: addValue = val;
+    }
+
+    if (!skipKey) {
+      res += key;
+      res += ": ";
+      if (addValue) {
+        res += addValue;
+        res += ", ";
+      }
+    }
+  }
+
+  return res.slice(0, res.length - 2);
+};
+
 /**
 * @param {File[]} files
 * @param {object} groups

frontend-app/src/components/FilesDownload/DownloadTable.jsx

@@ -0,0 +1,48 @@
+import { ReactElement } from "react";
+import { formatFilterJSON } from "../../adapters";
+
+/**
+* @param {object} props
+* @param {object[]} props.data
+* @param {Function?} props.onDownload
+* @returns {ReactElement}
+*/
+export default function DownloadTable({ data, onDownload }) {
+  return <table className="downloads__table">
+    <thead>
+      <tr>
+        <th>ID</th>
+        <th>author</th>
+        <th>status</th>
+        <th>create date</th>
+        <th>result size</th>
+        <th>result message</th>
+        <th>requested</th>
+        <th />
+      </tr>
+    </thead>
+    <tbody>
+      {
+        data.map((item) => (
+          <tr key={item.id}>
+            <td>{item.id}</td>
+            <td>{item.author}</td>
+            <td>{item.status.toLowerCase()}</td>
+            <td>{item.create_date}</td>
+            <td>{item.result_size}</td>
+            <td>{item.result_message}</td>
+            <td>{formatFilterJSON(item.filters)}</td>
+            <td onClick={() => onDownload(item.id)} className="downloads__table__button">
+              <button type="button">
+                <svg width="24" height="24" viewBox="0 0 24 24">
+                  <path d="M14.14 13H13V3a1 1 0 0 0-2 0v10H9.86a1 1 0 0 0-.69 1.5l2.14 3.12a.82.82 0 0 0 1.38 0l2.14-3.12a1 1 0 0 0-.69-1.5" />
+                  <path d="M19 22H5a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h3a1 1 0 0 1 0 2H5v11h14V9h-3a1 1 0 0 1 0-2h3a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2" />
+                </svg>
+              </button>
+            </td>
+          </tr>
+        ))
+      }
+    </tbody>
+  </table>;
+}

frontend-app/src/components/FilesDownload/index.jsx

@@ -1,10 +1,11 @@
-import { useState, ReactElement, useMemo } from "react";
+import { useState, ReactElement, useMemo, useRef, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { api } from "../../config/api";
 import { useDispatch } from "react-redux";
 import { addAlert } from "../../slices/alerts";
 import Load from "../ui/Load";
 import ValidationFilterGroup from '../forms/ValidationFilterGroup';
+import DownloadTable from "./DownloadTable";
 import "./styles.css";
 
 /** @type {{name: string, id: string}[]} */
@@ -27,6 +28,8 @@ const TYPE_FILTER = [
 export default function FilesDownload({ pathID, attributes }) {
   const [filterData, setFilterData] = useState({});
   const [loading, setLoading] = useState(false);
+  const [downloads, setDownloads] = useState([]);
+  const newCheckBox = useRef(null);
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const filterFields = useMemo(() => [
@@ -51,15 +54,12 @@ export default function FilesDownload({ pathID, attributes }) {
   const handleChange = (type, data) =>
     setFilterData((prev) => ({ ...prev, [type]: data }));
 
-  const createTask = async (event) => {
-    event.preventDefault();
-    var isNew = event.target.newFiles.checked;
-
+  const createTask = async () => {
     setLoading(true);
 
     try {
       var payload = { ...filterData };
-      if (isNew) payload.downloaded = false;
+      if (newCheckBox.current.checked) payload.downloaded = false;
 
       await api.post(`/api/projects/archive/${pathID}/`, payload, {
         headers: { Authorization: "Bearer " + localStorage.getItem("dtcAccess") },
@@ -82,29 +82,60 @@ export default function FilesDownload({ pathID, attributes }) {
     setLoading(false);
   };
 
-  return (
-    <div className="iss__filesDownload">
-      <h2 className="iss__filesDownload__caption">
-        Choose files to download or enter existing taskID
-      </h2>
+  const getDownloads = async () => {
+    try {
+      const { data } = await api.get(`/api/projects/archive/${pathID}/`, {
+        headers: { Authorization: "Bearer " + localStorage.getItem("dtcAccess") },
+      });
+
+      setDownloads(data);
+    }
+    catch ({ message, response }) {
+      var authFailed = response && (
+        response.status === 401 || response.status === 403
+      );
+
+      dispatch(addAlert({
+        message: "Getting files data error:" + message,
+        type: "error",
+        noSession: authFailed
+      }));
+
+      if (authFailed) navigate("/login");
+    }
+  };
+
+  useEffect(() => {
+    getDownloads();
+  }, []);
+
+  return <>
+    {/* todo: supposed to be a form element but val filter group has it inside */}
+    <div className="downloads">
       <ValidationFilterGroup
         disabled={false}
         filterData={filterFields}
         onChange={handleChange}
       />
-      <form onSubmit={createTask} className="iss__filesDownload__form">
-        <fieldset className="iss__filesDownload__mainSet">
-          <label className="iss__filesDownload__inputBox__wrap">
-            <input name="newFiles" type="checkbox" />
-            <span>not downloaded before</span>
-          </label>
-        </fieldset>
-        <button
-          className={
-            `iss__filesDownload__button${ loading ? " block--button" : "" }`
-          }
-        >{loading ? <Load isInline /> : <span>request</span>}</button>
-      </form>
+      <fieldset className="downloads__mainSet">
+        <label className="downloads__inputBox__wrap">
+          <input ref={newCheckBox} name="newFiles" type="checkbox" />
+          <span>not downloaded before</span>
+        </label>
+      </fieldset>
+      <button
+        type="button"
+        onClick={createTask}
+        className={
+          `downloads__button${ loading ? " block--button" : "" }`
+        }
+      >{loading ? <Load isInline /> : <span>request</span>}</button>
     </div>
-  );
+    {
+      downloads.length
+      ? <DownloadTable data={downloads} onDownload={(id) => { console.log(id); }}/>
+      : "No Data"
+    }
+
+  </>;
 }