From 505971858fcdcce9eb58a6810e0f1d80b4fccdd5 Mon Sep 17 00:00:00 2001
From: agmorev <agmorev@gmail.com>
Date: Mon, 13 May 2024 15:36:58 +0300
Subject: [PATCH 01/26] SXDEDPCXZIC-305 / show deleted records in trash

---
 ckanext/datavicmain/templates/admin/trash.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datavicmain/templates/admin/trash.html b/ckanext/datavicmain/templates/admin/trash.html
index 3da96d85..aef9bc57 100644
--- a/ckanext/datavicmain/templates/admin/trash.html
+++ b/ckanext/datavicmain/templates/admin/trash.html
@@ -4,7 +4,7 @@
   {% set truncate = truncate or 180 %}
   {% set truncate_title = truncate_title or 80 %}
   <ul class="user-list">
-    {% for pkg in c.deleted_packages %}
+    {% for pkg in data.package %}
       {% set title = pkg.title or pkg.name %}
       <li>
         {{ h.link_to(title|truncate(truncate_title), h.url_for('dataset.read', id=pkg.name)) }}

From f259bb9d62db051b944a6524384d9a1cf805c054 Mon Sep 17 00:00:00 2001
From: agmorev <agmorev@gmail.com>
Date: Wed, 15 May 2024 22:12:08 +0300
Subject: [PATCH 02/26] SXDEDPCXZIC-299 / changes to Category functionality

---
 ckanext/datavicmain/helpers.py                    | 15 ++++++++++++++-
 ckanext/datavicmain/plugins.py                    |  1 +
 .../datavicmain/templates/package/read_base.html  |  1 -
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ckanext/datavicmain/helpers.py b/ckanext/datavicmain/helpers.py
index 22d62c42..18320abd 100644
--- a/ckanext/datavicmain/helpers.py
+++ b/ckanext/datavicmain/helpers.py
@@ -6,7 +6,7 @@
 import logging
 import json
 import base64
-from typing import Any
+from typing import Any, Optional
 
 from urllib.parse import urlsplit, urljoin
 
@@ -326,3 +326,16 @@ def datavic_org_uploads_allowed(org_id: str) -> bool:
         return False
 
     return flake["data"].get(org.id, False)
+
+
+def get_group(group: Optional[str] = None,
+              include_datasets: bool = False) -> dict[str, Any]:
+    if group is None:
+        return {}
+    try:
+        return toolkit.get_action("group_show")(
+            {},
+            {"id": group, "include_datasets": include_datasets}
+        )
+    except (toolkit.NotFound, toolkit.ValidationError, toolkit.NotAuthorized):
+        return {}
diff --git a/ckanext/datavicmain/plugins.py b/ckanext/datavicmain/plugins.py
index 8b0ed256..71620321 100644
--- a/ckanext/datavicmain/plugins.py
+++ b/ckanext/datavicmain/plugins.py
@@ -238,6 +238,7 @@ def get_helpers(self):
             'get_digital_twin_resources': helpers.get_digital_twin_resources,
             'url_for_dtv_config': helpers.url_for_dtv_config,
             "datavic_org_uploads_allowed": helpers.datavic_org_uploads_allowed,
+            "get_group": helpers.get_group,
         }
 
     ## IConfigurer interface ##
diff --git a/ckanext/datavicmain/templates/package/read_base.html b/ckanext/datavicmain/templates/package/read_base.html
index 2574c28d..54eae01d 100644
--- a/ckanext/datavicmain/templates/package/read_base.html
+++ b/ckanext/datavicmain/templates/package/read_base.html
@@ -2,7 +2,6 @@
 
 {% block content_primary_nav %}
   {{ h.build_nav_icon('dataset.read', _('Dataset'), id=pkg.name, icon=None) }}
-  {{ h.build_nav_icon('dataset.groups', _('Categories'), id=pkg.name, icon=None) }}
   {{ h.build_nav_icon('activity.package_activity', _('Activity Stream'), id=pkg.name, icon=None) }}
 
   {% if h.group_resources_by_temporal_range(pkg.resources) | length > 1 %}

From e695e51af29c8228f1cbe06755cd580805bf489c Mon Sep 17 00:00:00 2001
From: agmorev <agmorev@gmail.com>
Date: Mon, 20 May 2024 18:06:45 +0300
Subject: [PATCH 03/26] SXDEDPCXZIC-298 / restrict access to activity stream

---
 ckanext/datavicmain/helpers.py                | 30 +++++++++++++++++++
 ckanext/datavicmain/plugins.py                |  1 +
 .../templates/organization/read_base.html     | 13 ++++++++
 .../templates/package/read_base.html          |  7 ++++-
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/datavicmain/templates/organization/read_base.html

diff --git a/ckanext/datavicmain/helpers.py b/ckanext/datavicmain/helpers.py
index 18320abd..a5d372e8 100644
--- a/ckanext/datavicmain/helpers.py
+++ b/ckanext/datavicmain/helpers.py
@@ -339,3 +339,33 @@ def get_group(group: Optional[str] = None,
         )
     except (toolkit.NotFound, toolkit.ValidationError, toolkit.NotAuthorized):
         return {}
+
+
+def has_user_capacity(
+    org_id: str,
+    current_user_id: str, 
+    capacity: Optional[str] = None) -> bool:
+    """Check if the current user has an appropriate capacity in the certain organization
+
+    Args:
+        org_id (str): the id or name of the organization
+        current_user_id (str): the id or name of the user
+        capacity (str): restrict the members returned to those with a given capacity,
+                        e.g. 'member', 'editor', 'admin', 'public', 'private'
+                        (optional, default: None)
+
+    Returns:
+        bool: True for success, False otherwise
+    """
+    try:
+        members = toolkit.get_action("member_list")(
+            {},
+            {"id": org_id, "object_type": "user", "capacity": capacity}
+        )
+        members_id = [member[0] for member in members]
+        if current_user_id in members_id:
+            return True
+    except (toolkit.ObjectNotFound, toolkit.NotAuthorized):
+        return False
+
+    return False
diff --git a/ckanext/datavicmain/plugins.py b/ckanext/datavicmain/plugins.py
index 71620321..87a46089 100644
--- a/ckanext/datavicmain/plugins.py
+++ b/ckanext/datavicmain/plugins.py
@@ -239,6 +239,7 @@ def get_helpers(self):
             'url_for_dtv_config': helpers.url_for_dtv_config,
             "datavic_org_uploads_allowed": helpers.datavic_org_uploads_allowed,
             "get_group": helpers.get_group,
+            "has_user_capacity": helpers.has_user_capacity,
         }
 
     ## IConfigurer interface ##
diff --git a/ckanext/datavicmain/templates/organization/read_base.html b/ckanext/datavicmain/templates/organization/read_base.html
new file mode 100644
index 00000000..c30e89d4
--- /dev/null
+++ b/ckanext/datavicmain/templates/organization/read_base.html
@@ -0,0 +1,13 @@
+{% ckan_extends %}
+
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon(group_type + '.read', h.humanize_entity_type('package', dataset_type, 'content tab') or _('Datasets'), id=group_dict.name, icon='sitemap') }}
+  {{ h.build_nav_icon(group_type + '.about', _('About'), id=group_dict.name, icon='info-circle') }}
+
+  {% set is_admin = h.has_user_capacity(group_dict.name, g.userobj.id, 'admin') %}
+  {% set is_editor = h.has_user_capacity(group_dict.name, g.userobj.id, 'editor') %}
+  {% if g.userobj.sysadmin or is_admin or is_editor %}
+    {{ h.build_nav_icon('activity.organization_activity', _('Activity Stream'), id=group_dict.name, offset=0, icon='clock') }}
+  {% endif %}
+{% endblock %}
diff --git a/ckanext/datavicmain/templates/package/read_base.html b/ckanext/datavicmain/templates/package/read_base.html
index 54eae01d..8ae0a704 100644
--- a/ckanext/datavicmain/templates/package/read_base.html
+++ b/ckanext/datavicmain/templates/package/read_base.html
@@ -2,7 +2,12 @@
 
 {% block content_primary_nav %}
   {{ h.build_nav_icon('dataset.read', _('Dataset'), id=pkg.name, icon=None) }}
-  {{ h.build_nav_icon('activity.package_activity', _('Activity Stream'), id=pkg.name, icon=None) }}
+
+  {% set is_admin = h.has_user_capacity(pkg.organization.id, g.userobj.id, 'admin') %}
+  {% set is_editor = h.has_user_capacity(pkg.organization.id, g.userobj.id, 'editor') %}
+  {% if g.userobj.sysadmin or is_admin or is_editor %}
+    {{ h.build_nav_icon('activity.package_activity', _('Activity Stream'), id=pkg.name, icon=None) }}
+  {% endif %}
 
   {% if h.group_resources_by_temporal_range(pkg.resources) | length > 1 %}
     {{ h.build_nav_icon('datavicmain.historical', _('Historical Data and Resources'), package_type=pkg.type, package_id=pkg.name, icon=None) }}

From abcc63733613620661f64369b1af328e2524bcee Mon Sep 17 00:00:00 2001
From: agmorev <agmorev@gmail.com>
Date: Tue, 21 May 2024 20:06:13 +0300
Subject: [PATCH 04/26] SXDEDPCXZIC-298 /restrict access to activity stream
 using url

---
 ckanext/datavicmain/logic/auth.py | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/ckanext/datavicmain/logic/auth.py b/ckanext/datavicmain/logic/auth.py
index 242d1a21..c6cc0a68 100644
--- a/ckanext/datavicmain/logic/auth.py
+++ b/ckanext/datavicmain/logic/auth.py
@@ -89,3 +89,38 @@ def user_show(context: Context, data_dict: DataDict) -> AuthResult:
             return {"success": True}
 
     return {"success": False}
+
+
+def _has_user_capacity_in_org(org_id: str, roles: list) -> bool:
+    """ Check if the current user has the necessary capacity in the certain
+        organization
+
+    Args:
+        org_id (str): id of the organization 
+        roles (list): list of necessary member roles in the organization
+
+    Returns:
+        bool: True if the current user has the necessary capacity in the certain
+        organization, False - otherwise
+    """
+    if authz.users_role_for_group_or_org(
+        group_id=org_id,
+        user_name=toolkit.current_user.name) in roles:
+        return True
+    return False
+
+
+@toolkit.chained_auth_function
+def package_activity_list(next_auth, context, data_dict):
+    allowed_roles = ["admin", "editor"]
+    if _has_user_capacity_in_org(context["package"].owner_org, allowed_roles):
+        return next_auth(context, data_dict)
+    return {"success": False}
+
+
+@toolkit.chained_auth_function
+def organization_activity_list(next_auth, context, data_dict):
+    allowed_roles = ["admin", "editor"]
+    if _has_user_capacity_in_org(data_dict["id"], allowed_roles):
+        return next_auth(context, data_dict)
+    return {"success": False}

From fdb1164dff491c390c5d720a0e0be8ddb66b52b9 Mon Sep 17 00:00:00 2001
From: Yan Rudenko <yan.rudenko@linkdigital.com.au>
Date: Mon, 10 Jun 2024 17:16:56 +0200
Subject: [PATCH 05/26] SXDEDPCXZIC-309_DATAVIC-651 / Update Dataset schema

---
 ckanext/datavicmain/iar_ckan_dataset.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ckanext/datavicmain/iar_ckan_dataset.yaml b/ckanext/datavicmain/iar_ckan_dataset.yaml
index e6eefd80..8719053d 100644
--- a/ckanext/datavicmain/iar_ckan_dataset.yaml
+++ b/ckanext/datavicmain/iar_ckan_dataset.yaml
@@ -22,6 +22,7 @@ dataset_fields:
 
 - field_name: alias
   preset: dataset_alias
+  display_group: General
 
 - field_name: notes
   label: Description
@@ -152,6 +153,7 @@ dataset_fields:
       label: "Off"
   validators: default(true) boolean_validator
   output_validators: boolean_validator
+  display_group: General
 
   # Security fields
 

From ab07ad2788e7993f1fe235ad9dd3edcff50ca568 Mon Sep 17 00:00:00 2001
From: oleksandrivaniuk <oleksandr.ivaniuk@linkdigital.com.au>
Date: Tue, 18 Jun 2024 18:47:49 +0300
Subject: [PATCH 06/26] SXDEDPCXZIC-313_DATAVIC-635 / make datatables_view
 prioritized

---
 ckanext/datavicmain/cli/maintain.py |  41 ++++++-----
 ckanext/datavicmain/logic/action.py | 102 ++++++++++++++++++++++------
 ckanext/datavicmain/logic/auth.py   |   4 ++
 ckanext/datavicmain/logic/scheme.py |  10 +++
 4 files changed, 119 insertions(+), 38 deletions(-)
 create mode 100644 ckanext/datavicmain/logic/scheme.py

diff --git a/ckanext/datavicmain/cli/maintain.py b/ckanext/datavicmain/cli/maintain.py
index 930f61aa..81015996 100644
--- a/ckanext/datavicmain/cli/maintain.py
+++ b/ckanext/datavicmain/cli/maintain.py
@@ -3,30 +3,23 @@
 import csv
 import datetime
 import logging
-import csv
-import openpyxl
 import mimetypes
-
+from itertools import groupby
 from os import path
 from typing import Any
-from sqlalchemy.orm import Query
-from itertools import groupby
 from urllib.parse import urlparse
 
-import click
-import tqdm
-
 import ckan.logic.validators as validators
 import ckan.model as model
 import ckan.plugins.toolkit as tk
 import click
+import openpyxl
 import tqdm
 from ckan.lib.munge import munge_title_to_name
 from ckan.model import Resource, ResourceView
 from ckan.types import Context
-from sqlalchemy.orm import Query
-
 from ckanext.harvest.model import HarvestObject, HarvestSource
+from sqlalchemy.orm import Query
 
 log = logging.getLogger(__name__)
 
@@ -477,13 +470,15 @@ def identify_resources_with_broken_recline():
         )
 
 
-@maintain.command(u"update-broken-urls",
-                  short_help=u"Update resources with broken urls")
+@maintain.command(
+    "update-broken-urls", short_help="Update resources with broken urls"
+)
 def update_broken_urls():
     """Change resources urls' protocols from http to https listed in XLSX file"""
 
     file = path.join(
-        path.dirname(__file__), "data/DTF Content list bulk URL change 20231017.xlsx"
+        path.dirname(__file__),
+        "data/DTF Content list bulk URL change 20231017.xlsx",
     )
     wb = openpyxl.load_workbook(file)
     ws = wb.active
@@ -500,15 +495,14 @@ def update_broken_urls():
 
         if not resource:
             click.secho(
-                f"Resource <{title}> with URL <{url}> does not exist",
-                fg="red"
+                f"Resource <{title}> with URL <{url}> does not exist", fg="red"
             )
             continue
 
         resource.url = row[XLSX_IDX_NEW_URL].value
         click.secho(
             f"URL of resource <{title}> has been updated to <{resource.url}>",
-            fg="green"
+            fg="green",
         )
 
         model.Session.commit()
@@ -549,3 +543,18 @@ def _suggest_file_format(url: str | None) -> str:
 
     mimetype, _ = mimetypes.guess_type(url)
     return validators.clean_format(mimetype) if mimetype else "unknown"
+
+
+@maintain.command("make-datatables-view-prioritized")
+def make_datatables_view_prioritized():
+    """Check if there are resources that have recline_view and datatables_view and
+    reorder them so that datatables_view is first."""
+    resources = model.Session.query(Resource).all()
+    number_reordered = 0
+    for resource in tqdm.tqdm(resources):
+        result = tk.get_action("datavic_datatables_view_prioritize")(
+            {"ignore_auth": True}, {"resource_id": resource.id}
+        )
+        if result.get("updated"):
+            number_reordered += 1
+    click.secho(f"Reordered {number_reordered} resources", fg="green")
diff --git a/ckanext/datavicmain/logic/action.py b/ckanext/datavicmain/logic/action.py
index 908aee9a..f46b829d 100644
--- a/ckanext/datavicmain/logic/action.py
+++ b/ckanext/datavicmain/logic/action.py
@@ -1,28 +1,32 @@
+from __future__ import annotations
+
 import logging
 from typing import Any
 
 import ckan.lib.plugins as lib_plugins
-import ckan.plugins.toolkit as toolkit
+import ckan.model as model
+import ckan.plugins.toolkit as tk
 import ckanapi
 import ckanext.datavic_iar_theme.helpers as theme_helpers
-from ckan import model
-from ckan.lib.dictization import model_dictize, model_save, table_dictize
+from ckan.lib.dictization import model_dictize, model_save
 from ckan.lib.navl.validators import not_empty
 from ckan.logic import schema as ckan_schema
-from ckan.model import State
+from ckan.logic import validate
+from ckan.model import ResourceView, State
 from ckan.types import Action, Context, DataDict
 from ckan.types.logic import ActionResult
-from ckanext.datavicmain import helpers, jobs
+from ckanext.datavicmain import helpers
+from ckanext.datavicmain.logic import scheme
 from sqlalchemy import or_
 
-_check_access = toolkit.check_access
-config = toolkit.config
+_check_access = tk.check_access
+config = tk.config
 log = logging.getLogger(__name__)
 user_is_registering = helpers.user_is_registering
-ValidationError = toolkit.ValidationError
-get_action = toolkit.get_action
-_validate = toolkit.navl_validate
-_get_or_bust = toolkit.get_or_bust
+ValidationError = tk.ValidationError
+get_action = tk.get_action
+_validate = tk.navl_validate
+_get_or_bust = tk.get_or_bust
 
 CONFIG_SYNCHRONIZED_ORGANIZATION_FIELDS = (
     "ckanext.datavicmain.synchronized_organization_fields"
@@ -133,7 +137,7 @@ def user_create(context, data_dict):
             "new_account_requested",
             {
                 "user_name": user.name,
-                "user_url": toolkit.url_for(
+                "user_url": tk.url_for(
                     "user.read", id=user.name, qualified=True
                 ),
                 "site_title": config.get("ckan.site_title"),
@@ -145,7 +149,7 @@ def user_create(context, data_dict):
     return user_dict
 
 
-@toolkit.chained_action
+@tk.chained_action
 def organization_update(next_, context, data_dict):
     from ckanext.syndicate import utils
 
@@ -168,8 +172,8 @@ def organization_update(next_, context, data_dict):
 
         patch = {
             f: result[f]
-            for f in toolkit.aslist(
-                toolkit.config.get(
+            for f in tk.aslist(
+                tk.config.get(
                     CONFIG_SYNCHRONIZED_ORGANIZATION_FIELDS,
                     DEFAULT_SYNCHRONIZED_ORGANIZATION_FIELDS,
                 )
@@ -180,7 +184,7 @@ def organization_update(next_, context, data_dict):
     return result
 
 
-@toolkit.chained_action
+@tk.chained_action
 def resource_update(
     next_: Action, context: Context, data_dict: DataDict
 ) -> ActionResult.ResourceUpdate:
@@ -191,7 +195,7 @@ def resource_update(
         _show_errors_in_sibling_resources(context, data_dict)
 
 
-@toolkit.chained_action
+@tk.chained_action
 def resource_create(
     next_: Action, context: Context, data_dict: DataDict
 ) -> ActionResult.ResourceCreate:
@@ -206,7 +210,7 @@ def _show_errors_in_sibling_resources(
     context: Context, data_dict: DataDict
 ) -> Any:
     """Retrieves and raises validation errors for resources within the same package."""
-    pkg_dict = toolkit.get_action("package_show")(
+    pkg_dict = tk.get_action("package_show")(
         context, {"id": data_dict["package_id"]}
     )
 
@@ -236,21 +240,21 @@ def _show_errors_in_sibling_resources(
         raise ValidationError(errors)
 
 
-@toolkit.side_effect_free
+@tk.side_effect_free
 def datavic_list_incomplete_resources(context, data_dict):
     """Retrieves a list of resources that are missing at least one required field."""
     try:
         pkg_type = data_dict.get("type", "dataset")
-        resource_schema = toolkit.h.scheming_get_dataset_schema(pkg_type)[
+        resource_schema = tk.h.scheming_get_dataset_schema(pkg_type)[
             "resource_fields"
         ]
     except TypeError:
-        raise toolkit.ValidationError(f"No schema for {pkg_type} package type")
+        raise tk.ValidationError(f"No schema for {pkg_type} package type")
 
     required_fields = [
         field["field_name"]
         for field in resource_schema
-        if toolkit.h.scheming_field_required(field)
+        if tk.h.scheming_field_required(field)
     ]
 
     missing_conditions = []
@@ -308,3 +312,57 @@ def datavic_list_incomplete_resources(context, data_dict):
         "num_packages": num_packages,
         "results": results,
     }
+
+
+@validate(scheme.datatables_view_prioritize)
+def datavic_datatables_view_prioritize(
+    context: Context, data_dict: DataDict
+) -> ActionResult:
+    """Check if the datatables view is prioritized over the recline view.
+    If not, swap their order.
+    """
+    tk.check_access("vic_datatables_view_prioritize", context, data_dict)
+
+    resource_id = data_dict["resource_id"]
+    res_views = sorted(
+        model.Session.query(ResourceView)
+        .filter(ResourceView.resource_id == resource_id)
+        .all(),
+        key=lambda x: x.order,
+    )
+    datatables_views = _filter_views(res_views, "datatables_view")
+    recline_views = _filter_views(res_views, "recline_view")
+
+    if not (
+        datatables_views
+        and recline_views
+        and datatables_views[0].order > recline_views[0].order
+    ):
+        return {"updated": False}
+
+    datatables_views[0].order, recline_views[0].order = (
+        recline_views[0].order,
+        datatables_views[0].order,
+    )
+    order = [view.id for view in sorted(res_views, key=lambda x: x.order)]
+    tk.get_action("resource_view_reorder")(
+        {"ignore_auth": True}, {"id": resource_id, "order": order}
+    )
+    return {"updated": True}
+
+
+@tk.chained_action
+def resource_view_create(next_, context, data_dict):
+    result = next_(context, data_dict)
+    if data_dict["view_type"] == "datatables_view":
+        tk.get_action("datavic_datatables_view_prioritize")(
+            {"ignore_auth": True}, {"resource_id": data_dict["resource_id"]}
+        )
+    return result
+
+
+def _filter_views(
+    res_views: list[ResourceView], view_type: str
+) -> list[ResourceView]:
+    """Return a list of views with the given view type."""
+    return [view for view in res_views if view.view_type == view_type]
diff --git a/ckanext/datavicmain/logic/auth.py b/ckanext/datavicmain/logic/auth.py
index 242d1a21..5affe939 100644
--- a/ckanext/datavicmain/logic/auth.py
+++ b/ckanext/datavicmain/logic/auth.py
@@ -89,3 +89,7 @@ def user_show(context: Context, data_dict: DataDict) -> AuthResult:
             return {"success": True}
 
     return {"success": False}
+
+
+def vic_datatables_view_prioritize(context, data_dict):
+    return {"success": False}
diff --git a/ckanext/datavicmain/logic/scheme.py b/ckanext/datavicmain/logic/scheme.py
new file mode 100644
index 00000000..1e431766
--- /dev/null
+++ b/ckanext/datavicmain/logic/scheme.py
@@ -0,0 +1,10 @@
+from ckan.logic.schema import validator_args
+
+
+@validator_args
+def datatables_view_prioritize(not_empty):
+    return {
+        "resource_id": [
+            not_empty,
+        ],
+    }

From 2fe60868e6fa423b9a42a52baf401b702650d144 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Thu, 20 Jun 2024 13:06:42 +0300
Subject: [PATCH 07/26] SXDEDPCXZIC-323 / Adding and managing home page content
 as superadmin, WIP

---
 ckanext/datavicmain_home/logic/action.py      | 102 ++++++++++
 ckanext/datavicmain_home/logic/auth.py        |   6 +
 ckanext/datavicmain_home/logic/schema.py      | 112 +++++++++++
 ckanext/datavicmain_home/logic/validators.py  |  16 ++
 .../migration/datavicmain_home/README         |   1 +
 .../migration/datavicmain_home/alembic.ini    |  74 +++++++
 .../migration/datavicmain_home/env.py         |  81 ++++++++
 .../migration/datavicmain_home/script.py.mako |  24 +++
 .../720d557e7d52_init_section_item_table.py   |  35 ++++
 ckanext/datavicmain_home/model.py             |  78 ++++++++
 ckanext/datavicmain_home/plugins.py           |  15 ++
 .../datavicmain_home/templates/header.html    |  11 +
 .../templates/vic_home/manage.html            |  66 ++++++
 ckanext/datavicmain_home/tests/conftest.py    |  30 +++
 .../tests/logic/test_action.py                | 188 ++++++++++++++++++
 ckanext/datavicmain_home/views.py             |  35 ++++
 setup.py                                      |   1 +
 test.ini                                      |   2 +-
 18 files changed, 876 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/datavicmain_home/logic/action.py
 create mode 100644 ckanext/datavicmain_home/logic/auth.py
 create mode 100644 ckanext/datavicmain_home/logic/schema.py
 create mode 100644 ckanext/datavicmain_home/logic/validators.py
 create mode 100644 ckanext/datavicmain_home/migration/datavicmain_home/README
 create mode 100644 ckanext/datavicmain_home/migration/datavicmain_home/alembic.ini
 create mode 100644 ckanext/datavicmain_home/migration/datavicmain_home/env.py
 create mode 100644 ckanext/datavicmain_home/migration/datavicmain_home/script.py.mako
 create mode 100644 ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
 create mode 100644 ckanext/datavicmain_home/model.py
 create mode 100644 ckanext/datavicmain_home/plugins.py
 create mode 100644 ckanext/datavicmain_home/templates/header.html
 create mode 100644 ckanext/datavicmain_home/templates/vic_home/manage.html
 create mode 100644 ckanext/datavicmain_home/tests/conftest.py
 create mode 100644 ckanext/datavicmain_home/tests/logic/test_action.py
 create mode 100644 ckanext/datavicmain_home/views.py

diff --git a/ckanext/datavicmain_home/logic/action.py b/ckanext/datavicmain_home/logic/action.py
new file mode 100644
index 00000000..5ce2263f
--- /dev/null
+++ b/ckanext/datavicmain_home/logic/action.py
@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+from typing import Any
+
+import ckan.types as types
+import ckan.model as model
+import ckan.plugins.toolkit as tk
+from ckan.logic import validate
+
+from ckanext.datavicmain_home.model import HomeSectionItem
+from ckanext.datavicmain_home.logic import schema
+
+
+@validate(schema.create_section_item)
+def create_section_item(
+    context: types.Context, data_dict: types.DataDict
+) -> dict[str, Any]:
+    """Create a new section item.
+
+    Args:
+        data_dict (dict): The data for the new section item.
+
+    Returns:
+        dict[str, Any]: The created section item.
+    """
+    tk.check_access("manage_home_sections", context, data_dict)
+
+    item = HomeSectionItem(**data_dict)
+
+    model.Session.add(item)
+    model.Session.commit()
+
+    return item.dictize(None)
+
+
+@validate(schema.delete_section_item)
+def delete_section_item(
+    context: types.Context, data_dict: types.DataDict
+) -> None:
+    """Delete a section item.
+
+    Args:
+        item_id (str): The id of the section item to delete.
+    """
+    tk.check_access("manage_home_sections", context, data_dict)
+
+    item = HomeSectionItem.get(data_dict["id"])
+
+    if item:
+        item.delete()
+        model.Session.commit()
+
+
+@validate(schema.update_section_item)
+def update_section_item(
+    context: types.Context, data_dict: types.DataDict
+) -> dict[str, Any]:
+    """Update a section item.
+
+    Args:
+        item_id (str): The id of the section item to update.
+        data_dict (dict): The data to update the section item with.
+
+    Raises:
+        tk.ValidationError: If the section item is not found.
+
+    Returns:
+        dict[str, Any]: The updated section item.
+    """
+    tk.check_access("manage_home_sections", context, data_dict)
+
+    item = HomeSectionItem.get(data_dict["id"])
+
+    if not item:
+        raise tk.ValidationError("Section item not found")
+
+    for key, value in data_dict.items():
+        setattr(item, key, value)
+
+    model.Session.commit()
+
+    return item.dictize({})
+
+
+@tk.side_effect_free
+@validate(schema.get_section_items_by_section_type)
+def get_section_items_by_section_type(
+    context: types.Context, data_dict: types.DataDict
+) -> list[dict[str, Any]]:
+    """Get section items by section type.
+
+    Args:
+        section_type (str): The section type to get items for.
+
+    Returns:
+        list[dict[str, Any]]: The section items.
+    """
+    tk.check_access("get_home_sections", context, data_dict)
+
+    items = HomeSectionItem.get_by_section(data_dict["section_type"])
+
+    return [item.dictize({}) for item in items]
diff --git a/ckanext/datavicmain_home/logic/auth.py b/ckanext/datavicmain_home/logic/auth.py
new file mode 100644
index 00000000..aab01c37
--- /dev/null
+++ b/ckanext/datavicmain_home/logic/auth.py
@@ -0,0 +1,6 @@
+def manage_home_sections(context, data_dict):
+    return {"success": False}
+
+
+def get_home_sections(context, data_dict):
+    return {"success": False}
diff --git a/ckanext/datavicmain_home/logic/schema.py b/ckanext/datavicmain_home/logic/schema.py
new file mode 100644
index 00000000..115c3b45
--- /dev/null
+++ b/ckanext/datavicmain_home/logic/schema.py
@@ -0,0 +1,112 @@
+from __future__ import annotations
+
+from typing import Any, Dict
+
+from ckan.logic.schema import validator_args
+
+from ckanext.datavicmain_home.model import HomeSectionItem
+
+Schema = Dict[str, Any]
+
+
+@validator_args
+def create_section_item(
+    not_empty,
+    default,
+    ignore_missing,
+    unicode_safe,
+    one_of,
+    ignore,
+    url_validator,
+) -> Schema:
+    return {
+        "title": [not_empty, unicode_safe],
+        "description": [ignore_missing, unicode_safe],
+        "image_id": [ignore_missing, unicode_safe],
+        "url": [ignore_missing, url_validator],
+        "state": [
+            default(HomeSectionItem.State.active),
+            one_of(
+                [HomeSectionItem.State.active, HomeSectionItem.State.inactive]
+            ),
+        ],
+        "section_type": [
+            default(HomeSectionItem.SectionType.news),
+            one_of(
+                [
+                    HomeSectionItem.SectionType.news,
+                    HomeSectionItem.SectionType.data,
+                    HomeSectionItem.SectionType.resources,
+                ]
+            ),
+        ],
+        "__extras": [ignore],
+    }
+
+
+@validator_args
+def delete_section_item(
+    not_empty, unicode_safe, ignore, home_section_item_exists
+) -> Schema:
+    return {
+        "id": [not_empty, unicode_safe, home_section_item_exists],
+        "__extras": [ignore],
+    }
+
+
+@validator_args
+def update_section_item(
+    not_empty,
+    ignore_missing,
+    unicode_safe,
+    one_of,
+    ignore,
+    default,
+    url_validator,
+    home_section_item_exists,
+) -> Schema:
+    return {
+        "id": [not_empty, unicode_safe, home_section_item_exists],
+        "title": [ignore_missing, unicode_safe],
+        "description": [ignore_missing, unicode_safe],
+        "image_id": [ignore_missing, unicode_safe],
+        "url": [ignore_missing, url_validator],
+        "state": [
+            default(HomeSectionItem.State.active),
+            one_of(
+                [HomeSectionItem.State.active, HomeSectionItem.State.inactive]
+            ),
+        ],
+        "section_type": [
+            default(HomeSectionItem.SectionType.news),
+            one_of(
+                [
+                    HomeSectionItem.SectionType.news,
+                    HomeSectionItem.SectionType.data,
+                    HomeSectionItem.SectionType.resources,
+                ]
+            ),
+        ],
+        "__extras": [ignore],
+    }
+
+
+@validator_args
+def get_section_items_by_section_type(
+    not_empty,
+    one_of,
+    ignore,
+) -> Schema:
+    return {
+        "section_type": [
+            not_empty,
+            one_of(
+                [
+                    HomeSectionItem.SectionType.news,
+                    HomeSectionItem.SectionType.data,
+                    HomeSectionItem.SectionType.resources,
+                ]
+            ),
+        ],
+        "__extras": [ignore],
+    }
diff --git a/ckanext/datavicmain_home/logic/validators.py b/ckanext/datavicmain_home/logic/validators.py
new file mode 100644
index 00000000..99c676ac
--- /dev/null
+++ b/ckanext/datavicmain_home/logic/validators.py
@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+import ckan.plugins.toolkit as tk
+
+from ckanext.datavicmain_home.model import HomeSectionItem
+
+
+def home_section_item_exists(item_id: str, context) -> str:
+    """Ensures that the home section item exists."""
+
+    result = HomeSectionItem.get(item_id)
+
+    if not result:
+        raise tk.Invalid(f"Home section item {item_id} not found")
+
+    return item_id
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/README b/ckanext/datavicmain_home/migration/datavicmain_home/README
new file mode 100644
index 00000000..98e4f9c4
--- /dev/null
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/README
@@ -0,0 +1 @@
+Generic single-database configuration.
\ No newline at end of file
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/alembic.ini b/ckanext/datavicmain_home/migration/datavicmain_home/alembic.ini
new file mode 100644
index 00000000..2a350f4b
--- /dev/null
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/alembic.ini
@@ -0,0 +1,74 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = %(here)s
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# timezone to use when rendering the date
+# within the migration file as well as the filename.
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+#truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; this defaults
+# to /home/berry/projects/datavic-iar/ckanext-datavicmain/ckanext/datavicmain_home/migration/datavicmain_home/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path
+# version_locations = %(here)s/bar %(here)s/bat /home/berry/projects/datavic-iar/ckanext-datavicmain/ckanext/datavicmain_home/migration/datavicmain_home/versions
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/env.py b/ckanext/datavicmain_home/migration/datavicmain_home/env.py
new file mode 100644
index 00000000..00936821
--- /dev/null
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/env.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+from alembic import context
+from sqlalchemy import engine_from_config, pool
+from logging.config import fileConfig
+
+import os
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = None
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+name = os.path.basename(os.path.dirname(__file__))
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+
+    url = config.get_main_option(u"sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=target_metadata, literal_binds=True,
+        version_table=u'{}_alembic_version'.format(name)
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section),
+        prefix=u'sqlalchemy.',
+        poolclass=pool.NullPool)
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+            version_table=u'{}_alembic_version'.format(name)
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/script.py.mako b/ckanext/datavicmain_home/migration/datavicmain_home/script.py.mako
new file mode 100644
index 00000000..2c015630
--- /dev/null
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
new file mode 100644
index 00000000..a8f2062d
--- /dev/null
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
@@ -0,0 +1,35 @@
+"""Init section item table
+
+Revision ID: 720d557e7d52
+Revises:
+Create Date: 2024-06-20 11:13:44.498807
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "720d557e7d52"
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        "home_section_item",
+        sa.Column("id", sa.Text(), nullable=False),
+        sa.Column("title", sa.Text(), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column("image_id", sa.Text(), nullable=True),
+        sa.Column("url", sa.Text(), nullable=True),
+        sa.Column("state", sa.Text(), nullable=False),
+        sa.Column("section_type", sa.Text(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+
+def downgrade():
+    op.drop_table("home_section_item")
diff --git a/ckanext/datavicmain_home/model.py b/ckanext/datavicmain_home/model.py
new file mode 100644
index 00000000..96bee630
--- /dev/null
+++ b/ckanext/datavicmain_home/model.py
@@ -0,0 +1,78 @@
+from __future__ import annotations
+
+import logging
+from datetime import datetime
+from typing import Any
+
+from ckan import model
+from ckan.model.types import make_uuid
+from ckan.plugins import toolkit as tk
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, Text
+from sqlalchemy.orm import Query, relationship
+from typing_extensions import Self
+
+
+log = logging.getLogger(__name__)
+
+
+class HomeSectionItem(tk.BaseModel):
+    __tablename__ = "home_section_item"
+
+    class State:
+        active = "active"
+        inactive = "inactive"
+
+    class SectionType:
+        news = "news"
+        data = "data"
+        resources = "resources"
+
+    id = Column(Text, primary_key=True, default=make_uuid)
+
+    title = Column(Text, nullable=False)
+    description = Column(Text, nullable=True)
+    image_id = Column(Text, nullable=True)
+    url = Column(Text, nullable=True)
+    state = Column(Text, nullable=False, default=State.active)
+    section_type = Column(Text, nullable=False, default=SectionType.news)
+
+    def __repr__(self):
+        return f"HomeSectionItem(title={self.title})"
+
+    @classmethod
+    def create(cls, data_dict) -> Self:
+        item = cls(**data_dict)
+
+        model.Session.add(item)
+        model.Session.commit()
+
+        return v
+
+    def delete(self) -> None:
+        model.Session().autoflush = False
+        model.Session.delete(self)
+
+    def dictize(self, context):
+        return {
+            "id": self.id,
+            "title": self.title,
+            "description": self.description,
+            "image_id": self.image_id,
+            "url": self.url,
+            "state": self.state,
+            "section_type": self.section_type,
+        }
+
+    @classmethod
+    def get(cls, item_id: str) -> Self | None:
+        query: Query = model.Session.query(cls).filter(cls.id == item_id)
+
+        return query.one_or_none()
+
+    @classmethod
+    def get_by_section(cls, section_type: str) -> list[Self]:
+        query: Query = model.Session.query(cls).filter(
+            cls.section_type == section_type
+        )
+
+        return query.all()
diff --git a/ckanext/datavicmain_home/plugins.py b/ckanext/datavicmain_home/plugins.py
new file mode 100644
index 00000000..6fdf36da
--- /dev/null
+++ b/ckanext/datavicmain_home/plugins.py
@@ -0,0 +1,15 @@
+import ckan.plugins as p
+import ckan.plugins.toolkit as tk
+
+
+@tk.blanket.actions
+@tk.blanket.auth_functions
+@tk.blanket.blueprints
+@tk.blanket.validators
+class DatavicHomePlugin(p.SingletonPlugin):
+    p.implements(p.IConfigurer)
+
+    # IConfigurer
+    def update_config(self, config_):
+        tk.add_template_directory(config_, "templates")
+        tk.add_resource("webassets", "datavicmain_home")
diff --git a/ckanext/datavicmain_home/templates/header.html b/ckanext/datavicmain_home/templates/header.html
new file mode 100644
index 00000000..2cea62ed
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/header.html
@@ -0,0 +1,11 @@
+{% ckan_extends %}
+
+{% block header_account_logged %}
+    <li>
+        <a href="{{ h.url_for('datavic_home.manage') }}" title="{{ _('Manage home page') }}">
+            <i class="fa fa-list-alt"></i>
+        </a>
+    </li>
+
+    {{ super() }}
+{% endblock %}
diff --git a/ckanext/datavicmain_home/templates/vic_home/manage.html b/ckanext/datavicmain_home/templates/vic_home/manage.html
new file mode 100644
index 00000000..3a0c2269
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/vic_home/manage.html
@@ -0,0 +1,66 @@
+{% extends "admin/base.html" %}
+
+{% import 'macros/form.html' as form %}
+
+{% block primary %}
+    <div class="primary col-sm-9 col-xs-12">
+        {% block primary_content %}
+            {% block page_header %}
+                <header class="module-content page-header">
+                    {% if self.content_action() | trim %}
+                        <div class="content_action">
+                        {% block content_action %}
+                            {{ super() }}
+                        {% endblock %}
+                        </div>
+                    {% endif %}
+
+                    <ul class="nav nav-tabs">
+                        {% block content_primary_nav %}
+                            {{ super() }}
+                        {% endblock %}
+                    </ul>
+                </header>
+            {% endblock %}
+
+            <div class="module-content">
+                {% if self.page_primary_action() | trim %}
+                  <div class="page_primary_action">
+                    {% block page_primary_action %}{% endblock %}
+                  </div>
+                {% endif %}
+
+                {% block primary_content_inner %}
+                    <form method='post' action="" id="admin-config-form" enctype="multipart/form-data">
+                        {{ h.csrf_input() }}
+
+                        {{ form.input('test', id='field-ckan-site-title', label=_('Site Title'), value=data.test, error=errors.test) }}
+
+                        {{ form.input('test2', id='field-ckan-main-css', label=_('Custom Stylesheet'), value=data.test2, error=errors.test2) }}
+
+                        <div class="form-actions">
+                            <button type="submit" class="btn btn-primary" name="save">{{ _('Update') }}</button>
+                        </div>
+                    </form>
+                {% endblock %}
+            </div>
+        {% endblock %}
+    </div>
+{% endblock %}
+
+{% block secondary %}
+    <aside class="secondary col-sm-3">
+        {% block secondary_content %}
+            <div class="module module-narrow module-shallow">
+                <h2 class="module-heading">
+                    <i class="fa fa-info-circle"></i>
+                    {{ _('Home page sections') }}
+                </h2>
+
+                <div class="module-content">
+                    <p>{{ _('You can manage the sections on the home page here.') }}</p>
+                </div>
+            </div>
+        {% endblock %}
+    </aside>
+{% endblock %}
diff --git a/ckanext/datavicmain_home/tests/conftest.py b/ckanext/datavicmain_home/tests/conftest.py
new file mode 100644
index 00000000..53e2c1c3
--- /dev/null
+++ b/ckanext/datavicmain_home/tests/conftest.py
@@ -0,0 +1,30 @@
+import pytest
+import factory
+
+from pytest_factoryboy import register
+
+import ckan.model as model
+from ckan.tests.factories import CKANFactory
+
+from ckanext.datavicmain_home.model import HomeSectionItem
+
+
+@pytest.fixture()
+def clean_db(reset_db, migrate_db_for):
+    reset_db()
+
+    migrate_db_for("datavicmain_home")
+
+
+@register
+class HomeSectionItemFactory(CKANFactory):
+    class Meta:
+        model = HomeSectionItem
+        action = "create_section_item"
+
+    title = factory.Faker("sentence")
+    description = factory.Faker("sentence")
+    image_id = factory.Faker("uuid4")
+    url = factory.Faker("url")
+    state = HomeSectionItem.State.active
+    section_type = HomeSectionItem.SectionType.news
diff --git a/ckanext/datavicmain_home/tests/logic/test_action.py b/ckanext/datavicmain_home/tests/logic/test_action.py
new file mode 100644
index 00000000..509984f8
--- /dev/null
+++ b/ckanext/datavicmain_home/tests/logic/test_action.py
@@ -0,0 +1,188 @@
+from __future__ import annotations
+
+from typing import TypedDict
+
+import pytest
+
+import ckan.plugins.toolkit as tk
+from ckan.tests.helpers import call_action
+
+from ckanext.datavicmain_home.model import HomeSectionItem
+
+
+class HomeSectionData(TypedDict):
+    id: str
+    title: str
+    description: str
+    image_id: str
+    url: str
+    state: str
+    section_type: str
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestHomeSectionItemCreate:
+    def test_basic_create(self, home_section_item_factory):
+        home_section_item: HomeSectionData = home_section_item_factory()
+
+        assert home_section_item["id"]
+        assert home_section_item["title"]
+        assert home_section_item["description"]
+        assert home_section_item["image_id"]
+        assert home_section_item["url"]
+        assert home_section_item["state"] == HomeSectionItem.State.active
+        assert (
+            home_section_item["section_type"]
+            == HomeSectionItem.SectionType.news
+        )
+
+    def test_create_with_invalid_url(self, home_section_item_factory):
+        with pytest.raises(tk.ValidationError):
+            home_section_item_factory(url="invalid-url")
+
+    def test_create_with_invalid_state(self, home_section_item_factory):
+        with pytest.raises(tk.ValidationError):
+            home_section_item_factory(state="invalid-state")
+
+    def test_create_with_invalid_section_type(self, home_section_item_factory):
+        with pytest.raises(tk.ValidationError):
+            home_section_item_factory(section_type="invalid-section-type")
+
+    def test_create_without_title(self, home_section_item_factory):
+        with pytest.raises(tk.ValidationError):
+            home_section_item_factory(title="")
+
+    def test_create_without_description(self, home_section_item_factory):
+        home_section_item = home_section_item_factory(description="")
+
+        assert home_section_item["description"] == ""
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestHomeSectionItemDelete:
+    def test_basic_delete(self, home_section_item_factory):
+        home_section_item: HomeSectionData = home_section_item_factory()
+
+        call_action("delete_section_item", id=home_section_item["id"])
+
+        result = call_action(
+            "get_section_items_by_section_type",
+            section_type=HomeSectionItem.SectionType.news,
+        )
+
+        assert not result
+
+    def test_delete_with_invalid_id(self):
+        with pytest.raises(tk.ValidationError):
+            call_action("delete_section_item", id="invalid-id")
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestHomeSectionItemUpdate:
+    def test_basic_update(self, home_section_item_factory):
+        home_section_item: HomeSectionData = home_section_item_factory()
+
+        new_title = "New title"
+        new_description = "New description"
+        new_image_id = "new-image-id"
+        new_url = "https://example.com"
+        new_state = HomeSectionItem.State.inactive
+        new_section_type = HomeSectionItem.SectionType.data
+
+        result = call_action(
+            "update_section_item",
+            id=home_section_item["id"],
+            title=new_title,
+            description=new_description,
+            image_id=new_image_id,
+            url=new_url,
+            state=new_state,
+            section_type=new_section_type,
+        )
+
+        assert result["title"] == new_title
+        assert result["description"] == new_description
+        assert result["image_id"] == new_image_id
+        assert result["url"] == new_url
+        assert result["state"] == new_state
+        assert result["section_type"] == new_section_type
+
+    def test_update_with_invalid_url(self, home_section_item_factory):
+        home_section_item = home_section_item_factory()
+
+        with pytest.raises(tk.ValidationError):
+            call_action(
+                "update_section_item",
+                id=home_section_item["id"],
+                url="invalid-url",
+            )
+
+    def test_update_with_invalid_state(self, home_section_item_factory):
+        home_section_item = home_section_item_factory()
+
+        with pytest.raises(tk.ValidationError):
+            call_action(
+                "update_section_item",
+                id=home_section_item["id"],
+                state="invalid-state",
+            )
+
+    def test_update_with_invalid_section_type(self, home_section_item_factory):
+        home_section_item = home_section_item_factory()
+
+        with pytest.raises(tk.ValidationError):
+            call_action(
+                "update_section_item",
+                id=home_section_item["id"],
+                section_type="invalid-section-type",
+            )
+
+    def test_update_without_title(self, home_section_item_factory):
+        home_section_item = home_section_item_factory()
+
+        result = call_action(
+            "update_section_item",
+            id=home_section_item["id"],
+            title="",
+        )
+
+        assert result["title"] == ""
+
+    def test_update_without_description(self, home_section_item_factory):
+        home_section_item = home_section_item_factory()
+
+        result = call_action(
+            "update_section_item",
+            id=home_section_item["id"],
+            description="",
+        )
+
+        assert result["description"] == ""
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestGetItemsBySectionType:
+    def test_get_items_by_section_type(self, home_section_item_factory):
+        home_section_item: HomeSectionData = home_section_item_factory()
+
+        result = call_action(
+            "get_section_items_by_section_type",
+            section_type=HomeSectionItem.SectionType.news,
+        )
+
+        assert result[0]["id"] == home_section_item["id"]
+
+    def test_get_items_by_invalid_section_type(self):
+        with pytest.raises(tk.ValidationError):
+            call_action(
+                "get_section_items_by_section_type",
+                section_type="invalid-section-type",
+            )
+
+    def test_no_items(self):
+        result = call_action(
+            "get_section_items_by_section_type",
+            section_type=HomeSectionItem.SectionType.news,
+        )
+
+        assert not result
diff --git a/ckanext/datavicmain_home/views.py b/ckanext/datavicmain_home/views.py
new file mode 100644
index 00000000..fe6e7db9
--- /dev/null
+++ b/ckanext/datavicmain_home/views.py
@@ -0,0 +1,35 @@
+# encoding: utf-8
+from __future__ import annotations
+
+import logging
+from typing import Union
+
+from flask.views import MethodView
+from flask import Blueprint
+
+from ckan.plugins import toolkit as tk
+from ckan.types import Response
+
+
+log = logging.getLogger(__name__)
+
+datavic_home = Blueprint("datavic_home", __name__)
+
+
+class HomeManage(MethodView):
+    def get(self) -> str:
+        return tk.render(
+            "vic_home/manage.html",
+            extra_vars={"test": "hello world", "errors": {}, "data": {}},
+        )
+
+    def post(self) -> Union[str, Response]:
+        tk.h.flash_success("Hello world")
+
+        return tk.redirect_to("datavic_home.manage")
+
+
+datavic_home.add_url_rule(
+    "/vic/home-manage", view_func=HomeManage.as_view("manage")
+)
+# datavic_home.manage
diff --git a/setup.py b/setup.py
index 691660c0..4b4e561a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@
 	"""
         [ckan.plugins]
         datavicmain_dataset = ckanext.datavicmain.plugins:DatasetForm
+        datavicmain_home = ckanext.datavicmain_home.plugins:DatavicHomePlugin
 
         [fanstatic.libraries]
     """,
diff --git a/test.ini b/test.ini
index d6414a2d..af855d3e 100644
--- a/test.ini
+++ b/test.ini
@@ -12,7 +12,7 @@ port = 5000
 use = config:../ckan/test-core.ini
 ckan.plugins =
              activity
-             datavicmain_dataset
+             datavicmain_dataset datavicmain_home
              scheming_datasets
              alias
 

From 3920d3373b24252276b77b8bebd404c6a8033d75 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Thu, 20 Jun 2024 15:03:19 +0300
Subject: [PATCH 08/26] SXDEDPCXZIC-323 / add schema

---
 ckanext/datavicmain_home/__init__.py          |  0
 ckanext/datavicmain_home/config_schema.yaml   | 61 +++++++++++++++++++
 .../templates/vic_home/manage.html            |  4 +-
 .../templates/vic_home/render_fields.html     |  3 +
 ckanext/datavicmain_home/utils.py             | 15 +++++
 ckanext/datavicmain_home/views.py             |  9 ++-
 6 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 ckanext/datavicmain_home/__init__.py
 create mode 100644 ckanext/datavicmain_home/config_schema.yaml
 create mode 100644 ckanext/datavicmain_home/templates/vic_home/render_fields.html
 create mode 100644 ckanext/datavicmain_home/utils.py

diff --git a/ckanext/datavicmain_home/__init__.py b/ckanext/datavicmain_home/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/ckanext/datavicmain_home/config_schema.yaml b/ckanext/datavicmain_home/config_schema.yaml
new file mode 100644
index 00000000..4491695d
--- /dev/null
+++ b/ckanext/datavicmain_home/config_schema.yaml
@@ -0,0 +1,61 @@
+scheming_version: 2
+schema_id: datavicmain_home_manage
+about: An example how to use scheming for config page
+
+fields:
+  - field_name: ckanext.ap_example.cache.duration
+    label: Cache TTL
+    form_placeholder: 600
+    validators: default(3600) int_validator
+    input_type: number
+
+  - field_name: ckanext.ap_example.drupal_url
+    label: Drupal base URL
+    required: true
+    display_snippet: link.html
+
+  - field_name: ckanext.ap_example.api_version
+    label: API version
+    validators: default(core), one_of([json, core])
+    preset: select
+    required: true
+    choices:
+      - value: json
+        label: JSON API
+      - value: core
+        label: Core REST API
+
+  - field_name: ckanext.ap_example.core.menu_export_endpoint
+    label: Menu export API endpoint
+    validators: unicode_safe
+    required: true
+    help_text: If you are using the core API version, you might face the situation when your endpoint differ from the default one
+
+  - field_name: ckanext.ap_example.timeout
+    label: API request timeout
+    validators: default(5) int_validator
+    input_type: number
+
+  - field_name: ckanext.ap_example.request.user
+    label: HTTP auth user
+    validators: unicode_safe
+
+  - field_name: ckanext.ap_example.request.pass
+    label: HTTP auth password
+    validators: unicode_safe
+    input_type: password
+
+  - field_name: contacts
+    label: Contacts
+    repeating_label: Contact
+    repeating_subfields:
+
+    - field_name: address
+      label: Address
+      required: true
+
+    - field_name: city
+      label: City
+
+    - field_name: phone
+      label: Phone Number
diff --git a/ckanext/datavicmain_home/templates/vic_home/manage.html b/ckanext/datavicmain_home/templates/vic_home/manage.html
index 3a0c2269..33f87cfe 100644
--- a/ckanext/datavicmain_home/templates/vic_home/manage.html
+++ b/ckanext/datavicmain_home/templates/vic_home/manage.html
@@ -34,9 +34,7 @@
                     <form method='post' action="" id="admin-config-form" enctype="multipart/form-data">
                         {{ h.csrf_input() }}
 
-                        {{ form.input('test', id='field-ckan-site-title', label=_('Site Title'), value=data.test, error=errors.test) }}
-
-                        {{ form.input('test2', id='field-ckan-main-css', label=_('Custom Stylesheet'), value=data.test2, error=errors.test2) }}
+                        {% snippet 'vic_home/render_fields.html', fields=schema.fields, data=data, errors=errors %}
 
                         <div class="form-actions">
                             <button type="submit" class="btn btn-primary" name="save">{{ _('Update') }}</button>
diff --git a/ckanext/datavicmain_home/templates/vic_home/render_fields.html b/ckanext/datavicmain_home/templates/vic_home/render_fields.html
new file mode 100644
index 00000000..75d21c97
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/vic_home/render_fields.html
@@ -0,0 +1,3 @@
+{% for field in fields if field.form_snippet is not none %}
+    {% snippet 'scheming/snippets/form_field.html', field=field, data=data, errors=errors %}
+{% endfor %}
diff --git a/ckanext/datavicmain_home/utils.py b/ckanext/datavicmain_home/utils.py
new file mode 100644
index 00000000..6e9345a5
--- /dev/null
+++ b/ckanext/datavicmain_home/utils.py
@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from typing import Any
+
+
+def get_config_schema() -> dict[Any, Any] | None:
+    from ckanext.scheming.plugins import _load_schemas, _expand_schemas
+
+    schemas = _load_schemas(
+        ["ckanext.datavicmain_home:config_schema.yaml"], "schema_id"
+    )
+    expanded_schemas = _expand_schemas(schemas)
+
+    if schema := expanded_schemas.get("datavicmain_home_manage"):
+        return schema
diff --git a/ckanext/datavicmain_home/views.py b/ckanext/datavicmain_home/views.py
index fe6e7db9..f2f336f7 100644
--- a/ckanext/datavicmain_home/views.py
+++ b/ckanext/datavicmain_home/views.py
@@ -10,6 +10,7 @@
 from ckan.plugins import toolkit as tk
 from ckan.types import Response
 
+from ckanext.datavicmain_home import utils
 
 log = logging.getLogger(__name__)
 
@@ -20,7 +21,12 @@ class HomeManage(MethodView):
     def get(self) -> str:
         return tk.render(
             "vic_home/manage.html",
-            extra_vars={"test": "hello world", "errors": {}, "data": {}},
+            extra_vars={
+                "test": "hello world",
+                "errors": {},
+                "data": {},
+                "schema": utils.get_config_schema(),
+            },
         )
 
     def post(self) -> Union[str, Response]:
@@ -32,4 +38,3 @@ def post(self) -> Union[str, Response]:
 datavic_home.add_url_rule(
     "/vic/home-manage", view_func=HomeManage.as_view("manage")
 )
-# datavic_home.manage

From 5f19826760f70f990d88ce490ed27736cb75b46d Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Mon, 24 Jun 2024 16:18:00 +0300
Subject: [PATCH 09/26] SXDEDPCXZIC-323 / wip

---
 ckanext/datavicmain_home/config_schema.yaml   |  92 +++++-------
 ckanext/datavicmain_home/logic/action.py      |  67 ++++++++-
 ckanext/datavicmain_home/logic/schema.py      |   4 +-
 .../720d557e7d52_init_section_item_table.py   |   1 +
 ckanext/datavicmain_home/model.py             |   7 +
 .../scheming/form_snippets/vic_text.html      |  19 +++
 .../templates/vic_home/add_or_edit.html       |  20 +++
 .../templates/vic_home/base.html              |  40 +++++
 .../templates/vic_home/manage.html            | 100 +++++--------
 .../tests/logic/test_action.py                |  15 ++
 ckanext/datavicmain_home/utils.py             |   5 +-
 ckanext/datavicmain_home/views.py             | 139 +++++++++++++++++-
 12 files changed, 384 insertions(+), 125 deletions(-)
 create mode 100644 ckanext/datavicmain_home/templates/scheming/form_snippets/vic_text.html
 create mode 100644 ckanext/datavicmain_home/templates/vic_home/add_or_edit.html
 create mode 100644 ckanext/datavicmain_home/templates/vic_home/base.html

diff --git a/ckanext/datavicmain_home/config_schema.yaml b/ckanext/datavicmain_home/config_schema.yaml
index 4491695d..0daa024a 100644
--- a/ckanext/datavicmain_home/config_schema.yaml
+++ b/ckanext/datavicmain_home/config_schema.yaml
@@ -1,61 +1,49 @@
 scheming_version: 2
-schema_id: datavicmain_home_manage
-about: An example how to use scheming for config page
+schema_id: datavicmain_home_item
+about: A form for an item in the home page
 
 fields:
-  - field_name: ckanext.ap_example.cache.duration
-    label: Cache TTL
-    form_placeholder: 600
-    validators: default(3600) int_validator
-    input_type: number
-
-  - field_name: ckanext.ap_example.drupal_url
-    label: Drupal base URL
+  - field_name: title
+    label: Title
     required: true
-    display_snippet: link.html
+    form_attrs:
+      required: 1
+
+  - field_name: description
+    label: Description
 
-  - field_name: ckanext.ap_example.api_version
-    label: API version
-    validators: default(core), one_of([json, core])
+  - field_name: file
+    label: File
+    preset: resource_url_upload
+
+  - field_name: section_type
+    label: Type
     preset: select
     required: true
     choices:
-      - value: json
-        label: JSON API
-      - value: core
-        label: Core REST API
-
-  - field_name: ckanext.ap_example.core.menu_export_endpoint
-    label: Menu export API endpoint
-    validators: unicode_safe
+      - value: news
+        label: News or Event
+      - value: data
+        label: Data Category
+      - value: resources
+        label: Resource
+    form_attrs:
+      required: 1
+
+  - field_name: state
+    label: State
+    preset: select
     required: true
-    help_text: If you are using the core API version, you might face the situation when your endpoint differ from the default one
-
-  - field_name: ckanext.ap_example.timeout
-    label: API request timeout
-    validators: default(5) int_validator
-    input_type: number
-
-  - field_name: ckanext.ap_example.request.user
-    label: HTTP auth user
-    validators: unicode_safe
-
-  - field_name: ckanext.ap_example.request.pass
-    label: HTTP auth password
-    validators: unicode_safe
-    input_type: password
-
-  - field_name: contacts
-    label: Contacts
-    repeating_label: Contact
-    repeating_subfields:
-
-    - field_name: address
-      label: Address
-      required: true
-
-    - field_name: city
-      label: City
-
-    - field_name: phone
-      label: Phone Number
+    choices:
+      - value: active
+        label: Active
+      - value: inactive
+        label: Inactive
+    form_attrs:
+      required: 1
+
+  - field_name: weight
+    label: Weight
+    form_snippet: vic_text.html
+    input_type: numeric
+    validators: default(0) int_validator
diff --git a/ckanext/datavicmain_home/logic/action.py b/ckanext/datavicmain_home/logic/action.py
index 5ce2263f..5dae78ec 100644
--- a/ckanext/datavicmain_home/logic/action.py
+++ b/ckanext/datavicmain_home/logic/action.py
@@ -25,6 +25,12 @@ def create_section_item(
     """
     tk.check_access("manage_home_sections", context, data_dict)
 
+    if "upload" in data_dict:
+        upload = data_dict.pop("upload")
+
+        result = tk.get_action("files_file_create")(context, {"upload": upload})
+        data_dict["image_id"] = result["id"]
+
     item = HomeSectionItem(**data_dict)
 
     model.Session.add(item)
@@ -46,9 +52,17 @@ def delete_section_item(
 
     item = HomeSectionItem.get(data_dict["id"])
 
-    if item:
-        item.delete()
-        model.Session.commit()
+    if not item:
+        return
+
+    if item.image_id:
+        try:
+            tk.get_action("files_file_delete")(context, {"id": item.image_id})
+        except (tk.ValidationError, tk.ObjectNotFound):
+            pass
+
+    item.delete()
+    model.Session.commit()
 
 
 @validate(schema.update_section_item)
@@ -74,6 +88,18 @@ def update_section_item(
     if not item:
         raise tk.ValidationError("Section item not found")
 
+    if "upload" in data_dict:
+        if item.image_id:
+            try:
+                tk.get_action("files_file_delete")(context, {"id": item.image_id})
+            except (tk.ValidationError, tk.ObjectNotFound):
+                pass
+
+        upload = data_dict.pop("upload")
+
+        result = tk.get_action("files_file_create")(context, {"upload": upload})
+        data_dict["image_id"] = result["id"]
+
     for key, value in data_dict.items():
         setattr(item, key, value)
 
@@ -100,3 +126,38 @@ def get_section_items_by_section_type(
     items = HomeSectionItem.get_by_section(data_dict["section_type"])
 
     return [item.dictize({}) for item in items]
+
+@tk.side_effect_free
+def get_all_section_items(
+    context: types.Context, data_dict: types.DataDict
+) -> list[dict[str, Any]]:
+    """Get all section items.
+
+    Returns:
+        list[dict[str, Any]]: The section items.
+    """
+    tk.check_access("get_home_sections", context, data_dict)
+
+    items = HomeSectionItem.all()
+
+    return [item.dictize({}) for item in items]
+
+
+@tk.side_effect_free
+def get_section_item(context: types.Context, data_dict: types.DataDict) -> dict[str, Any]:
+    """Get a section item.
+
+    Args:
+        item_id (str): The id of the section item to get.
+
+    Returns:
+        dict[str, Any]: The section item.
+    """
+    tk.check_access("get_home_sections", context, data_dict)
+
+    item = HomeSectionItem.get(data_dict["id"])
+
+    if not item:
+        raise tk.ObjectNotFound("Section item not found")
+
+    return item.dictize({})
diff --git a/ckanext/datavicmain_home/logic/schema.py b/ckanext/datavicmain_home/logic/schema.py
index 115c3b45..4bf89d9f 100644
--- a/ckanext/datavicmain_home/logic/schema.py
+++ b/ckanext/datavicmain_home/logic/schema.py
@@ -22,7 +22,7 @@ def create_section_item(
     return {
         "title": [not_empty, unicode_safe],
         "description": [ignore_missing, unicode_safe],
-        "image_id": [ignore_missing, unicode_safe],
+        "upload": [ignore_missing],
         "url": [ignore_missing, url_validator],
         "state": [
             default(HomeSectionItem.State.active),
@@ -69,7 +69,7 @@ def update_section_item(
         "id": [not_empty, unicode_safe, home_section_item_exists],
         "title": [ignore_missing, unicode_safe],
         "description": [ignore_missing, unicode_safe],
-        "image_id": [ignore_missing, unicode_safe],
+        "upload": [ignore_missing],
         "url": [ignore_missing, url_validator],
         "state": [
             default(HomeSectionItem.State.active),
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
index a8f2062d..c7665208 100644
--- a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
@@ -27,6 +27,7 @@ def upgrade():
         sa.Column("url", sa.Text(), nullable=True),
         sa.Column("state", sa.Text(), nullable=False),
         sa.Column("section_type", sa.Text(), nullable=False),
+        sa.Column("weight", sa.Integer(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
     )
 
diff --git a/ckanext/datavicmain_home/model.py b/ckanext/datavicmain_home/model.py
index 96bee630..57649180 100644
--- a/ckanext/datavicmain_home/model.py
+++ b/ckanext/datavicmain_home/model.py
@@ -35,6 +35,7 @@ class SectionType:
     url = Column(Text, nullable=True)
     state = Column(Text, nullable=False, default=State.active)
     section_type = Column(Text, nullable=False, default=SectionType.news)
+    weight = Column(Integer, nullable=False, default=0)
 
     def __repr__(self):
         return f"HomeSectionItem(title={self.title})"
@@ -76,3 +77,9 @@ def get_by_section(cls, section_type: str) -> list[Self]:
         )
 
         return query.all()
+
+    @classmethod
+    def all(cls) -> list[Self]:
+        query: Query = model.Session.query(cls)
+
+        return query.all()
diff --git a/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_text.html b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_text.html
new file mode 100644
index 00000000..c0eb7779
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_text.html
@@ -0,0 +1,19 @@
+{#} alterations: type=field.input_type {#}
+
+{% import 'macros/form.html' as form %}
+
+{% call form.input(
+    field.field_name,
+    id='field-' + field.field_name,
+    label=h.scheming_language_text(field.label),
+    placeholder=h.scheming_language_text(field.form_placeholder),
+    value=data[field.field_name],
+    error=errors[field.field_name],
+    classes=field.classes if 'classes' in field else ['control-medium'],
+    attrs=dict({"class": "form-control"}, **(field.get('form_attrs', {}))),
+    is_required=h.scheming_field_required(field),
+    type=field.input_type
+    )
+%}
+    {%- snippet 'scheming/form_snippets/help_text.html', field=field -%}
+{% endcall %}
diff --git a/ckanext/datavicmain_home/templates/vic_home/add_or_edit.html b/ckanext/datavicmain_home/templates/vic_home/add_or_edit.html
new file mode 100644
index 00000000..f62a9b4d
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/vic_home/add_or_edit.html
@@ -0,0 +1,20 @@
+{% extends "vic_home/base.html" %}
+
+{% block primary_content_inner %}
+    <form method="POST" enctype="multipart/form-data">
+        {{ h.csrf_input() }}
+
+
+        {{ data }}
+        {% snippet 'vic_home/render_fields.html', fields=schema.fields, data=data, errors=errors %}
+
+        <div class="form-actions">
+            <a href="{{ h.url_for('datavic_home.manage') }}" class="btn btn-secondary">{{ _('Cancel') }}</a>
+            <button type="submit" class="btn btn-primary" name="save">{{ _('Update/Create') }}</button>
+        </div>
+    </form>
+{% endblock %}
+
+{% block vic_info_content %}
+    <p>{{ _('Create a new entity to display on a home page') }}</p>
+{% endblock %}
diff --git a/ckanext/datavicmain_home/templates/vic_home/base.html b/ckanext/datavicmain_home/templates/vic_home/base.html
new file mode 100644
index 00000000..1f0972bf
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/vic_home/base.html
@@ -0,0 +1,40 @@
+{% extends "admin/base.html" %}
+
+{% import 'macros/form.html' as form %}
+
+{% block primary %}
+    <div class="primary col-sm-9 col-xs-12">
+        {% block primary_content %}
+            <div class="module-content">
+                {% if self.page_primary_action() | trim %}
+                  <div class="page_primary_action">
+                    {% block page_primary_action %}{% endblock %}
+                  </div>
+                {% endif %}
+
+                {% block primary_content_inner %}
+
+                {% endblock %}
+            </div>
+        {% endblock %}
+    </div>
+{% endblock %}
+
+{% block secondary %}
+    <aside class="secondary col-sm-3">
+        {% block secondary_content %}
+            <div class="module module-narrow module-shallow">
+                <h2 class="module-heading">
+                    <i class="fa fa-info-circle"></i>
+                    {{ _('Home page sections') }}
+                </h2>
+
+                <div class="module-content">
+                    {% block vic_info_content %}
+
+                    {% endblock %}
+                </div>
+            </div>
+        {% endblock %}
+    </aside>
+{% endblock %}
diff --git a/ckanext/datavicmain_home/templates/vic_home/manage.html b/ckanext/datavicmain_home/templates/vic_home/manage.html
index 33f87cfe..15a8479b 100644
--- a/ckanext/datavicmain_home/templates/vic_home/manage.html
+++ b/ckanext/datavicmain_home/templates/vic_home/manage.html
@@ -1,64 +1,44 @@
-{% extends "admin/base.html" %}
-
-{% import 'macros/form.html' as form %}
-
-{% block primary %}
-    <div class="primary col-sm-9 col-xs-12">
-        {% block primary_content %}
-            {% block page_header %}
-                <header class="module-content page-header">
-                    {% if self.content_action() | trim %}
-                        <div class="content_action">
-                        {% block content_action %}
-                            {{ super() }}
-                        {% endblock %}
+{% extends "vic_home/base.html" %}
+
+{% block primary_content_inner %}
+    <p>
+        <a href="{{ h.url_for('datavic_home.new') }}" class="btn btn-primary">{{ _("Add new item") }}</a>
+    </p>
+
+    <table class="table table-header table-hover table-bordered">
+        <thead>
+            <tr>
+                <th>{{ _('Title') }}</th>
+                <th>{{ _('State') }}</th>
+                <th>{{ _('Type') }}</th>
+                <th>{{ _('Actions') }}</th>
+            </tr>
+        </thead>
+
+        <tbody>
+            {% for home_item in home_items %}
+            {{ home_item }}
+                <tr>
+                    <td>{{ home_item.title }}</td>
+                    <td>{{ home_item.state }}</td>
+                    <td>{{ home_item.section_type }}</td>
+                    <td>
+                        <div class="btn-group pull-right">
+                            <a class="btn btn-sm" href="{{ h.url_for('datavic_home.edit', item_id=home_item.id) }}" title="{{ _('Edit') }}">
+                                <i class="fa fa-wrench"></i>
+                            </a>
+
+                            <a class="btn btn-danger btn-sm" href="{{ h.url_for('datavic_home.delete', item_id=home_item.id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this item?') }}" title="{{ _('Delete') }}">
+                                <i class="fa fa-times"></i>
+                            </a>
                         </div>
-                    {% endif %}
-
-                    <ul class="nav nav-tabs">
-                        {% block content_primary_nav %}
-                            {{ super() }}
-                        {% endblock %}
-                    </ul>
-                </header>
-            {% endblock %}
-
-            <div class="module-content">
-                {% if self.page_primary_action() | trim %}
-                  <div class="page_primary_action">
-                    {% block page_primary_action %}{% endblock %}
-                  </div>
-                {% endif %}
-
-                {% block primary_content_inner %}
-                    <form method='post' action="" id="admin-config-form" enctype="multipart/form-data">
-                        {{ h.csrf_input() }}
-
-                        {% snippet 'vic_home/render_fields.html', fields=schema.fields, data=data, errors=errors %}
-
-                        <div class="form-actions">
-                            <button type="submit" class="btn btn-primary" name="save">{{ _('Update') }}</button>
-                        </div>
-                    </form>
-                {% endblock %}
-            </div>
-        {% endblock %}
-    </div>
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 {% endblock %}
 
-{% block secondary %}
-    <aside class="secondary col-sm-3">
-        {% block secondary_content %}
-            <div class="module module-narrow module-shallow">
-                <h2 class="module-heading">
-                    <i class="fa fa-info-circle"></i>
-                    {{ _('Home page sections') }}
-                </h2>
-
-                <div class="module-content">
-                    <p>{{ _('You can manage the sections on the home page here.') }}</p>
-                </div>
-            </div>
-        {% endblock %}
-    </aside>
+{% block vic_info_content %}
+    <p>{{ _('You can manage the sections on the home page here.') }}</p>
 {% endblock %}
diff --git a/ckanext/datavicmain_home/tests/logic/test_action.py b/ckanext/datavicmain_home/tests/logic/test_action.py
index 509984f8..845db560 100644
--- a/ckanext/datavicmain_home/tests/logic/test_action.py
+++ b/ckanext/datavicmain_home/tests/logic/test_action.py
@@ -186,3 +186,18 @@ def test_no_items(self):
         )
 
         assert not result
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestGetAllItems:
+    def test_get_all_items(self, home_section_item_factory):
+        home_section_item: HomeSectionData = home_section_item_factory()
+
+        result = call_action("get_all_section_items")
+
+        assert result[0]["id"] == home_section_item["id"]
+
+    def test_no_items(self):
+        result = call_action("get_all_section_items")
+
+        assert not result
diff --git a/ckanext/datavicmain_home/utils.py b/ckanext/datavicmain_home/utils.py
index 6e9345a5..b064a3d9 100644
--- a/ckanext/datavicmain_home/utils.py
+++ b/ckanext/datavicmain_home/utils.py
@@ -3,7 +3,7 @@
 from typing import Any
 
 
-def get_config_schema() -> dict[Any, Any] | None:
+def get_config_schema() -> dict[Any, Any]:
     from ckanext.scheming.plugins import _load_schemas, _expand_schemas
 
     schemas = _load_schemas(
@@ -11,5 +11,4 @@ def get_config_schema() -> dict[Any, Any] | None:
     )
     expanded_schemas = _expand_schemas(schemas)
 
-    if schema := expanded_schemas.get("datavicmain_home_manage"):
-        return schema
+    return expanded_schemas["datavicmain_home_item"]
diff --git a/ckanext/datavicmain_home/views.py b/ckanext/datavicmain_home/views.py
index f2f336f7..32ad917c 100644
--- a/ckanext/datavicmain_home/views.py
+++ b/ckanext/datavicmain_home/views.py
@@ -2,19 +2,24 @@
 from __future__ import annotations
 
 import logging
-from typing import Union
+from typing import Union, Any
 
 from flask.views import MethodView
 from flask import Blueprint
 
+from ckan import types
 from ckan.plugins import toolkit as tk
 from ckan.types import Response
+from ckan.logic import parse_params
+from ckan.lib.navl.dictization_functions import convert
+
+from ckanext.scheming.validation import validators_from_string
 
 from ckanext.datavicmain_home import utils
 
 log = logging.getLogger(__name__)
 
-datavic_home = Blueprint("datavic_home", __name__)
+datavic_home = Blueprint("datavic_home", __name__, url_prefix="/vic/home")
 
 
 class HomeManage(MethodView):
@@ -22,7 +27,46 @@ def get(self) -> str:
         return tk.render(
             "vic_home/manage.html",
             extra_vars={
-                "test": "hello world",
+                "home_items": tk.get_action("get_all_section_items")({}, {}),
+            },
+        )
+
+    def post(self) -> Union[str, Response]:
+        tk.h.flash_success("Hello world")
+
+        return tk.redirect_to("datavic_home.manage")
+
+
+class HomeItemCreateOrUpdate(MethodView):
+    def validate_data(
+        self, data: dict[str, Any], schema: dict[str, Any]
+    ) -> tuple[dict[str, Any], types.FlattenErrorDict]:
+        errors: types.FlattenErrorDict = dict((key, []) for key in data)
+
+        for field_name in data:
+            field: dict[str, Any] | None = tk.h.scheming_field_by_name(
+                schema["fields"], field_name
+            )
+
+            if not field:
+                continue
+
+            if "validators" not in field:
+                continue
+
+            for validator in validators_from_string(
+                field["validators"], field, schema
+            ):
+                convert(validator, field_name, data, errors, context={})
+
+        return data, errors
+
+
+class HomeItemCreate(HomeItemCreateOrUpdate):
+    def get(self) -> str:
+        return tk.render(
+            "vic_home/add_or_edit.html",
+            extra_vars={
                 "errors": {},
                 "data": {},
                 "schema": utils.get_config_schema(),
@@ -30,11 +74,96 @@ def get(self) -> str:
         )
 
     def post(self) -> Union[str, Response]:
-        tk.h.flash_success("Hello world")
+        data = parse_params(tk.request.form)
+        schema = utils.get_config_schema()
+
+        if file := tk.request.files.get("upload"):
+            data["upload"] = file
+
+        data, errors = self.validate_data(data, schema)
+
+        if any(list(errors.values())):
+            return tk.render(
+                "vic_home/add_or_edit.html",
+                extra_vars={
+                    "errors": errors,
+                    "data": data,
+                    "schema": schema,
+                },
+            )
+
+        tk.get_action("create_section_item")({}, data)
+
+        tk.h.flash_success("Done")
+
+        return tk.redirect_to("datavic_home.manage")
+
+
+class HomeItemEdit(HomeItemCreateOrUpdate):
+    action = "update_section_item"
+
+    def get(self, item_id: str) -> str:
+        try:
+            data = tk.get_action("get_section_item")({}, {"id": item_id})
+        except tk.ObjectNotFound:
+            tk.abort(404)
+
+        return tk.render(
+            "vic_home/add_or_edit.html",
+            extra_vars={
+                "errors": {},
+                "data": data,
+                "schema": utils.get_config_schema(),
+            },
+        )
+    def post(self, item_id: str) -> Union[str, Response]:
+        try:
+            tk.get_action("get_section_item")({}, {"id": item_id})
+        except tk.ObjectNotFound:
+            tk.abort(404)
+
+        data = parse_params(tk.request.form)
+        schema = utils.get_config_schema()
+
+        if file := tk.request.files.get("upload"):
+            data["upload"] = file
+
+        data["id"] = item_id
+
+        data, errors = self.validate_data(data, schema)
+
+        if any(list(errors.values())):
+            return tk.render(
+                "vic_home/add_or_edit.html",
+                extra_vars={
+                    "errors": errors,
+                    "data": data,
+                    "schema": schema,
+                },
+            )
+
+        tk.get_action("update_section_item")({}, data)
+
+        tk.h.flash_success("Done")
 
         return tk.redirect_to("datavic_home.manage")
 
+class HomeItemDelete(MethodView):
+    def post(self, item_id: str) -> Union[str, Response]:
+        try:
+            tk.get_action("get_section_item")({}, {"id": item_id})
+        except tk.ObjectNotFound:
+            tk.abort(404)
+
+        tk.get_action("delete_section_item")({}, {"id": item_id})
+
+        tk.h.flash_success("Done")
+
+        return tk.redirect_to("datavic_home.manage")
 
+datavic_home.add_url_rule("/manage", view_func=HomeManage.as_view("manage"))
+datavic_home.add_url_rule("/new", view_func=HomeItemCreate.as_view("new"))
 datavic_home.add_url_rule(
-    "/vic/home-manage", view_func=HomeManage.as_view("manage")
+    "/edit/<item_id>", view_func=HomeItemEdit.as_view("edit")
 )
+datavic_home.add_url_rule("/delete/<item_id>", view_func=HomeItemDelete.as_view("delete"))

From d5858b6c1b5b37818b7ca1235df6195ea489c662 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Mon, 24 Jun 2024 17:44:52 +0300
Subject: [PATCH 10/26] SXDEDPCXZIC-323 / wip 2

---
 .../assets/js/vic-entity-file.js              | 34 +++++++++++++++++++
 ckanext/datavicmain_home/assets/webassets.yml |  8 +++++
 ckanext/datavicmain_home/config_schema.yaml   | 19 +++++++++--
 ckanext/datavicmain_home/logic/action.py      | 24 +++++++++++++
 .../720d557e7d52_init_section_item_table.py   |  2 ++
 ckanext/datavicmain_home/model.py             |  4 ++-
 ckanext/datavicmain_home/plugins.py           |  2 +-
 .../scheming/form_snippets/vic_upload.html    | 24 +++++++++++++
 .../templates/vic_home/add_or_edit.html       |  2 --
 .../templates/vic_home/base.html              |  6 ++++
 .../templates/vic_home/manage.html            |  1 -
 ckanext/datavicmain_home/views.py             | 14 +++++---
 12 files changed, 127 insertions(+), 13 deletions(-)
 create mode 100644 ckanext/datavicmain_home/assets/js/vic-entity-file.js
 create mode 100644 ckanext/datavicmain_home/assets/webassets.yml
 create mode 100644 ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html

diff --git a/ckanext/datavicmain_home/assets/js/vic-entity-file.js b/ckanext/datavicmain_home/assets/js/vic-entity-file.js
new file mode 100644
index 00000000..bb791ef9
--- /dev/null
+++ b/ckanext/datavicmain_home/assets/js/vic-entity-file.js
@@ -0,0 +1,34 @@
+ckan.module("vic-entity-file", function ($, _) {
+    "use strict";
+
+    return {
+        options: {
+            itemId: null
+        },
+        initialize: function () {
+            $.proxyAll(this, /_on/);
+
+            if (!this.options.itemId) {
+                console.error("No item ID provided");
+                return;
+            }
+
+            $(".vic-remove-image").on("click", this._onDeleteImage);
+        },
+
+        _onDeleteImage: function (e) {
+            console.log('test');
+
+            $.ajax({
+                url: this.sandbox.client.url("/api/action/vic_home_remove_item_image"),
+                type: "POST",
+                data: {
+                    item_id: this.options.itemId
+                },
+                success: function () {
+                    $(".image-preview").children().remove();
+                }
+            });
+        }
+    };
+});
diff --git a/ckanext/datavicmain_home/assets/webassets.yml b/ckanext/datavicmain_home/assets/webassets.yml
new file mode 100644
index 00000000..f8cb3895
--- /dev/null
+++ b/ckanext/datavicmain_home/assets/webassets.yml
@@ -0,0 +1,8 @@
+js-global:
+  filter: rjsmin
+  output: ckanext-alias/%(version)s-vic-home.js
+  contents:
+    - js/vic-entity-file.js
+  extra:
+    preload:
+      - base/main
diff --git a/ckanext/datavicmain_home/config_schema.yaml b/ckanext/datavicmain_home/config_schema.yaml
index 0daa024a..8b202d0a 100644
--- a/ckanext/datavicmain_home/config_schema.yaml
+++ b/ckanext/datavicmain_home/config_schema.yaml
@@ -11,10 +11,20 @@ fields:
 
   - field_name: description
     label: Description
+    preset: markdown
 
-  - field_name: file
+  - field_name: image_id
     label: File
-    preset: resource_url_upload
+    validators: ignore_missing
+    form_snippet: vic_upload.html
+    form_attrs:
+      accept: image/png, image/gif, image/jpeg
+
+  - field_name: url
+    label: URL
+    validators: ignore_missing unicode_safe url_validator
+    form_snippet: vic_text.html
+    input_type: url
 
   - field_name: section_type
     label: Type
@@ -29,6 +39,7 @@ fields:
         label: Resource
     form_attrs:
       required: 1
+    help_text: The type of the item. Defines in which section of the home page the item will be displayed.
 
   - field_name: state
     label: State
@@ -41,9 +52,11 @@ fields:
         label: Inactive
     form_attrs:
       required: 1
+    help_text: The state of the item. Active items will be displayed on the home page.
 
   - field_name: weight
     label: Weight
     form_snippet: vic_text.html
-    input_type: numeric
+    input_type: number
     validators: default(0) int_validator
+    help_text: The weight of the item. Items with higher weights will be displayed first. Default is 0.
diff --git a/ckanext/datavicmain_home/logic/action.py b/ckanext/datavicmain_home/logic/action.py
index 5dae78ec..b10834d8 100644
--- a/ckanext/datavicmain_home/logic/action.py
+++ b/ckanext/datavicmain_home/logic/action.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime
 from typing import Any
 
 import ckan.types as types
@@ -103,6 +104,8 @@ def update_section_item(
     for key, value in data_dict.items():
         setattr(item, key, value)
 
+    item.modified_at = datetime.datetime.utcnow()
+
     model.Session.commit()
 
     return item.dictize({})
@@ -161,3 +164,24 @@ def get_section_item(context: types.Context, data_dict: types.DataDict) -> dict[
         raise tk.ObjectNotFound("Section item not found")
 
     return item.dictize({})
+
+
+def vic_home_remove_item_image(context, data_dict):
+    tk.check_access("manage_home_sections", context, data_dict)
+
+    image_id: str = tk.get_or_bust(tk.request.form, "item_id")
+
+    item = HomeSectionItem.get(image_id)
+
+    if not item or not item.image_id:
+        return {"success": True}
+
+    try:
+        tk.get_action("files_file_delete")({}, {"id": item.image_id})
+    except (tk.ValidationError, tk.ObjectNotFound):
+        pass
+    else:
+        item.image_id = None
+        model.Session.commit()
+
+    return {"success": True}
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
index c7665208..ef7e12ae 100644
--- a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
@@ -28,6 +28,8 @@ def upgrade():
         sa.Column("state", sa.Text(), nullable=False),
         sa.Column("section_type", sa.Text(), nullable=False),
         sa.Column("weight", sa.Integer(), nullable=False),
+        sa.Column("created_at", sa.DateTime(), nullable=False),
+        sa.Column("modified_at", sa.DateTime(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
     )
 
diff --git a/ckanext/datavicmain_home/model.py b/ckanext/datavicmain_home/model.py
index 57649180..0d7accf8 100644
--- a/ckanext/datavicmain_home/model.py
+++ b/ckanext/datavicmain_home/model.py
@@ -36,6 +36,8 @@ class SectionType:
     state = Column(Text, nullable=False, default=State.active)
     section_type = Column(Text, nullable=False, default=SectionType.news)
     weight = Column(Integer, nullable=False, default=0)
+    created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
+    modified_at = Column(DateTime, nullable=False, default=datetime.utcnow)
 
     def __repr__(self):
         return f"HomeSectionItem(title={self.title})"
@@ -47,7 +49,7 @@ def create(cls, data_dict) -> Self:
         model.Session.add(item)
         model.Session.commit()
 
-        return v
+        return item
 
     def delete(self) -> None:
         model.Session().autoflush = False
diff --git a/ckanext/datavicmain_home/plugins.py b/ckanext/datavicmain_home/plugins.py
index 6fdf36da..007d623a 100644
--- a/ckanext/datavicmain_home/plugins.py
+++ b/ckanext/datavicmain_home/plugins.py
@@ -12,4 +12,4 @@ class DatavicHomePlugin(p.SingletonPlugin):
     # IConfigurer
     def update_config(self, config_):
         tk.add_template_directory(config_, "templates")
-        tk.add_resource("webassets", "datavicmain_home")
+        tk.add_resource("assets", "vic_home")
diff --git a/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
new file mode 100644
index 00000000..2d740e8c
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
@@ -0,0 +1,24 @@
+
+<!-- File input for uploading a new file -->
+
+<div class="form-group control-medium">
+    <label for="upload" class="form-label">{{ _("File") }}</label>
+
+    {% if data.image_id %}
+        <div class="controls align-items-center d-flex" data-module="vic-entity-file" data-module-item-id="{{ data.id }}">
+            {% set file_info = h.files_link_details(data.image_id) %}
+
+            <div class="image-preview">
+                <img src="{{ file_info.href }}" alt="Uploaded Image" style="max-width: 200px;">
+                <button type="button" class="btn btn-danger vic-remove-image">{{ _("Remove") }}</button>
+            </div>
+
+            <input type="hidden" name="image_id" value="{{ data.image_id }}">
+
+        </div>
+    {% endif %}
+
+    <div class="controls mt-3">
+        <input type="file" name="upload" id="file" accept="image/*">
+    </div>
+</div>
diff --git a/ckanext/datavicmain_home/templates/vic_home/add_or_edit.html b/ckanext/datavicmain_home/templates/vic_home/add_or_edit.html
index f62a9b4d..5016e9fa 100644
--- a/ckanext/datavicmain_home/templates/vic_home/add_or_edit.html
+++ b/ckanext/datavicmain_home/templates/vic_home/add_or_edit.html
@@ -4,8 +4,6 @@
     <form method="POST" enctype="multipart/form-data">
         {{ h.csrf_input() }}
 
-
-        {{ data }}
         {% snippet 'vic_home/render_fields.html', fields=schema.fields, data=data, errors=errors %}
 
         <div class="form-actions">
diff --git a/ckanext/datavicmain_home/templates/vic_home/base.html b/ckanext/datavicmain_home/templates/vic_home/base.html
index 1f0972bf..9abe2a83 100644
--- a/ckanext/datavicmain_home/templates/vic_home/base.html
+++ b/ckanext/datavicmain_home/templates/vic_home/base.html
@@ -38,3 +38,9 @@ <h2 class="module-heading">
         {% endblock %}
     </aside>
 {% endblock %}
+
+{% block scripts %}
+    {% asset "vic_home/js-global" %}
+
+    {{ super() }}
+{% endblock %}
diff --git a/ckanext/datavicmain_home/templates/vic_home/manage.html b/ckanext/datavicmain_home/templates/vic_home/manage.html
index 15a8479b..7a93f815 100644
--- a/ckanext/datavicmain_home/templates/vic_home/manage.html
+++ b/ckanext/datavicmain_home/templates/vic_home/manage.html
@@ -17,7 +17,6 @@
 
         <tbody>
             {% for home_item in home_items %}
-            {{ home_item }}
                 <tr>
                     <td>{{ home_item.title }}</td>
                     <td>{{ home_item.state }}</td>
diff --git a/ckanext/datavicmain_home/views.py b/ckanext/datavicmain_home/views.py
index 32ad917c..3579c53f 100644
--- a/ckanext/datavicmain_home/views.py
+++ b/ckanext/datavicmain_home/views.py
@@ -5,7 +5,7 @@
 from typing import Union, Any
 
 from flask.views import MethodView
-from flask import Blueprint
+from flask import Blueprint, jsonify
 
 from ckan import types
 from ckan.plugins import toolkit as tk
@@ -94,7 +94,7 @@ def post(self) -> Union[str, Response]:
 
         tk.get_action("create_section_item")({}, data)
 
-        tk.h.flash_success("Done")
+        tk.h.flash_success("The item has been created")
 
         return tk.redirect_to("datavic_home.manage")
 
@@ -116,6 +116,7 @@ def get(self, item_id: str) -> str:
                 "schema": utils.get_config_schema(),
             },
         )
+
     def post(self, item_id: str) -> Union[str, Response]:
         try:
             tk.get_action("get_section_item")({}, {"id": item_id})
@@ -144,10 +145,11 @@ def post(self, item_id: str) -> Union[str, Response]:
 
         tk.get_action("update_section_item")({}, data)
 
-        tk.h.flash_success("Done")
+        tk.h.flash_success("The item has been updated")
 
         return tk.redirect_to("datavic_home.manage")
 
+
 class HomeItemDelete(MethodView):
     def post(self, item_id: str) -> Union[str, Response]:
         try:
@@ -157,7 +159,7 @@ def post(self, item_id: str) -> Union[str, Response]:
 
         tk.get_action("delete_section_item")({}, {"id": item_id})
 
-        tk.h.flash_success("Done")
+        tk.h.flash_success("The item has been deleted")
 
         return tk.redirect_to("datavic_home.manage")
 
@@ -166,4 +168,6 @@ def post(self, item_id: str) -> Union[str, Response]:
 datavic_home.add_url_rule(
     "/edit/<item_id>", view_func=HomeItemEdit.as_view("edit")
 )
-datavic_home.add_url_rule("/delete/<item_id>", view_func=HomeItemDelete.as_view("delete"))
+datavic_home.add_url_rule(
+    "/delete/<item_id>", view_func=HomeItemDelete.as_view("delete")
+)

From 70c47df52b38baf4178aee2b657a59ce18c1297e Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Tue, 25 Jun 2024 11:57:35 +0300
Subject: [PATCH 11/26] SXDEDPCXZIC-323 / wip 3

---
 ckanext/datavicmain_home/config_schema.yaml   | 22 ++++++++++++++-----
 ckanext/datavicmain_home/helpers.py           | 22 +++++++++++++++++++
 ckanext/datavicmain_home/logic/schema.py      |  6 +++++
 .../720d557e7d52_init_section_item_table.py   |  1 +
 ckanext/datavicmain_home/model.py             |  5 +++++
 ckanext/datavicmain_home/plugins.py           |  1 +
 .../scheming/form_snippets/vic_upload.html    | 12 ++++++++--
 .../templates/vic_home/base.html              |  4 ++++
 ckanext/datavicmain_home/views.py             |  2 +-
 9 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 ckanext/datavicmain_home/helpers.py

diff --git a/ckanext/datavicmain_home/config_schema.yaml b/ckanext/datavicmain_home/config_schema.yaml
index 8b202d0a..c291a3d7 100644
--- a/ckanext/datavicmain_home/config_schema.yaml
+++ b/ckanext/datavicmain_home/config_schema.yaml
@@ -11,20 +11,32 @@ fields:
 
   - field_name: description
     label: Description
-    preset: markdown
+    form_snippet: textarea.html
 
   - field_name: image_id
-    label: File
+    label: Image File
     validators: ignore_missing
     form_snippet: vic_upload.html
+    help_text: The image file. This will be displayed on the home page. Has a priority over the URL.
     form_attrs:
       accept: image/png, image/gif, image/jpeg
 
   - field_name: url
-    label: URL
+    label: Image URL
     validators: ignore_missing unicode_safe url_validator
     form_snippet: vic_text.html
     input_type: url
+    help_text: The URL of the image. This will be displayed on the home page.
+
+  - field_name: entity_url
+    label: Item URL
+    validators: ignore_missing unicode_safe url_validator
+    form_snippet: vic_text.html
+    input_type: url
+    help_text: User will be redirected to this URL when clicking on the item.
+    required: true
+    form_attrs:
+      required: 1
 
   - field_name: section_type
     label: Type
@@ -37,9 +49,9 @@ fields:
         label: Data Category
       - value: resources
         label: Resource
+    help_text: The type of the item. Defines in which section of the home page the item will be displayed.
     form_attrs:
       required: 1
-    help_text: The type of the item. Defines in which section of the home page the item will be displayed.
 
   - field_name: state
     label: State
@@ -50,9 +62,9 @@ fields:
         label: Active
       - value: inactive
         label: Inactive
+    help_text: The state of the item. Active items will be displayed on the home page.
     form_attrs:
       required: 1
-    help_text: The state of the item. Active items will be displayed on the home page.
 
   - field_name: weight
     label: Weight
diff --git a/ckanext/datavicmain_home/helpers.py b/ckanext/datavicmain_home/helpers.py
new file mode 100644
index 00000000..7d852e44
--- /dev/null
+++ b/ckanext/datavicmain_home/helpers.py
@@ -0,0 +1,22 @@
+from __future__ import annotations
+
+from typing import Any
+
+from ckanext.datavicmain_home.model import HomeSectionItem
+
+
+def get_item_by_section_type(section_type: str) -> list[dict[str, Any]]:
+    """Get item by type.
+
+    Args:
+        item_type (str): The item type to get items for.
+
+    Returns:
+        list[dict[str, Any]]: The section items.
+    """
+
+    return [
+        item.dictize({})
+        for item in HomeSectionItem.get_by_section(section_type)
+        if item.state == HomeSectionItem.State.active
+    ]
diff --git a/ckanext/datavicmain_home/logic/schema.py b/ckanext/datavicmain_home/logic/schema.py
index 4bf89d9f..3eabfedd 100644
--- a/ckanext/datavicmain_home/logic/schema.py
+++ b/ckanext/datavicmain_home/logic/schema.py
@@ -4,6 +4,7 @@
 
 from ckan.logic.schema import validator_args
 
+from ckan.logic.validators import int_validator
 from ckanext.datavicmain_home.model import HomeSectionItem
 
 Schema = Dict[str, Any]
@@ -18,12 +19,14 @@ def create_section_item(
     one_of,
     ignore,
     url_validator,
+    int_validator
 ) -> Schema:
     return {
         "title": [not_empty, unicode_safe],
         "description": [ignore_missing, unicode_safe],
         "upload": [ignore_missing],
         "url": [ignore_missing, url_validator],
+        "entity_url": [not_empty, url_validator],
         "state": [
             default(HomeSectionItem.State.active),
             one_of(
@@ -40,6 +43,7 @@ def create_section_item(
                 ]
             ),
         ],
+        "weight": [default(0), int_validator],
         "__extras": [ignore],
     }
 
@@ -71,6 +75,7 @@ def update_section_item(
         "description": [ignore_missing, unicode_safe],
         "upload": [ignore_missing],
         "url": [ignore_missing, url_validator],
+        "entity_url": [not_empty, url_validator],
         "state": [
             default(HomeSectionItem.State.active),
             one_of(
@@ -87,6 +92,7 @@ def update_section_item(
                 ]
             ),
         ],
+        "weight": [default(0), int_validator],
         "__extras": [ignore],
     }
 
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
index ef7e12ae..68d30be2 100644
--- a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
@@ -25,6 +25,7 @@ def upgrade():
         sa.Column("description", sa.Text(), nullable=True),
         sa.Column("image_id", sa.Text(), nullable=True),
         sa.Column("url", sa.Text(), nullable=True),
+        sa.Column("entity_url", sa.Text(), nullable=False),
         sa.Column("state", sa.Text(), nullable=False),
         sa.Column("section_type", sa.Text(), nullable=False),
         sa.Column("weight", sa.Integer(), nullable=False),
diff --git a/ckanext/datavicmain_home/model.py b/ckanext/datavicmain_home/model.py
index 0d7accf8..2b8d3fea 100644
--- a/ckanext/datavicmain_home/model.py
+++ b/ckanext/datavicmain_home/model.py
@@ -33,6 +33,7 @@ class SectionType:
     description = Column(Text, nullable=True)
     image_id = Column(Text, nullable=True)
     url = Column(Text, nullable=True)
+    entity_url = Column(Text, nullable=False)
     state = Column(Text, nullable=False, default=State.active)
     section_type = Column(Text, nullable=False, default=SectionType.news)
     weight = Column(Integer, nullable=False, default=0)
@@ -62,8 +63,12 @@ def dictize(self, context):
             "description": self.description,
             "image_id": self.image_id,
             "url": self.url,
+            "entity_url": self.entity_url,
             "state": self.state,
             "section_type": self.section_type,
+            "weight": self.weight,
+            "created_at": self.created_at,
+            "modified_at": self.modified_at,
         }
 
     @classmethod
diff --git a/ckanext/datavicmain_home/plugins.py b/ckanext/datavicmain_home/plugins.py
index 007d623a..0a43b3ea 100644
--- a/ckanext/datavicmain_home/plugins.py
+++ b/ckanext/datavicmain_home/plugins.py
@@ -6,6 +6,7 @@
 @tk.blanket.auth_functions
 @tk.blanket.blueprints
 @tk.blanket.validators
+@tk.blanket.helpers
 class DatavicHomePlugin(p.SingletonPlugin):
     p.implements(p.IConfigurer)
 
diff --git a/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
index 2d740e8c..0015b69c 100644
--- a/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
+++ b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
@@ -1,5 +1,4 @@
-
-<!-- File input for uploading a new file -->
+{% import 'macros/form.html' as form %}
 
 <div class="form-group control-medium">
     <label for="upload" class="form-label">{{ _("File") }}</label>
@@ -20,5 +19,14 @@
 
     <div class="controls mt-3">
         <input type="file" name="upload" id="file" accept="image/*">
+
+        {%- if field.help_text -%}
+            {% set text = h.scheming_language_text(field.help_text) %}
+            {{- form.info(
+                text=text|safe if field.get('help_allow_html', false) else text,
+                inline=field.get('help_inline', false)
+                ) -}}
+        {%- endif -%}
+
     </div>
 </div>
diff --git a/ckanext/datavicmain_home/templates/vic_home/base.html b/ckanext/datavicmain_home/templates/vic_home/base.html
index 9abe2a83..12fc7db6 100644
--- a/ckanext/datavicmain_home/templates/vic_home/base.html
+++ b/ckanext/datavicmain_home/templates/vic_home/base.html
@@ -2,6 +2,10 @@
 
 {% import 'macros/form.html' as form %}
 
+{% block breadcrumb_content %}
+<li class="active">{{ h.nav_link(_('Manage home items'), named_route='datavic_home.manage') }}</li>
+{% endblock %}
+
 {% block primary %}
     <div class="primary col-sm-9 col-xs-12">
         {% block primary_content %}
diff --git a/ckanext/datavicmain_home/views.py b/ckanext/datavicmain_home/views.py
index 3579c53f..f05710dd 100644
--- a/ckanext/datavicmain_home/views.py
+++ b/ckanext/datavicmain_home/views.py
@@ -5,7 +5,7 @@
 from typing import Union, Any
 
 from flask.views import MethodView
-from flask import Blueprint, jsonify
+from flask import Blueprint
 
 from ckan import types
 from ckan.plugins import toolkit as tk

From 4c8b201d66b76ef9dc24fe4e239f961e8fcd48a8 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Tue, 25 Jun 2024 14:04:29 +0300
Subject: [PATCH 12/26] SXDEDPCXZIC-323 / wip 4

---
 ckanext/datavicmain_home/config_schema.yaml     | 14 ++++++++++++++
 ckanext/datavicmain_home/helpers.py             | 13 ++++++++-----
 ckanext/datavicmain_home/model.py               |  4 ++--
 .../templates/vic_home/base.html                | 17 ++++-------------
 ckanext/datavicmain_home/views.py               |  2 +-
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/ckanext/datavicmain_home/config_schema.yaml b/ckanext/datavicmain_home/config_schema.yaml
index c291a3d7..58c817df 100644
--- a/ckanext/datavicmain_home/config_schema.yaml
+++ b/ckanext/datavicmain_home/config_schema.yaml
@@ -6,6 +6,8 @@ fields:
   - field_name: title
     label: Title
     required: true
+    classes:
+      - control-full
     form_attrs:
       required: 1
 
@@ -20,6 +22,8 @@ fields:
     help_text: The image file. This will be displayed on the home page. Has a priority over the URL.
     form_attrs:
       accept: image/png, image/gif, image/jpeg
+    classes:
+      - control-full
 
   - field_name: url
     label: Image URL
@@ -27,6 +31,8 @@ fields:
     form_snippet: vic_text.html
     input_type: url
     help_text: The URL of the image. This will be displayed on the home page.
+    classes:
+      - control-full
 
   - field_name: entity_url
     label: Item URL
@@ -37,6 +43,8 @@ fields:
     required: true
     form_attrs:
       required: 1
+    classes:
+      - control-full
 
   - field_name: section_type
     label: Type
@@ -52,6 +60,8 @@ fields:
     help_text: The type of the item. Defines in which section of the home page the item will be displayed.
     form_attrs:
       required: 1
+    classes:
+      - control-full
 
   - field_name: state
     label: State
@@ -65,6 +75,8 @@ fields:
     help_text: The state of the item. Active items will be displayed on the home page.
     form_attrs:
       required: 1
+    classes:
+      - control-full
 
   - field_name: weight
     label: Weight
@@ -72,3 +84,5 @@ fields:
     input_type: number
     validators: default(0) int_validator
     help_text: The weight of the item. Items with higher weights will be displayed first. Default is 0.
+    classes:
+      - control-full
diff --git a/ckanext/datavicmain_home/helpers.py b/ckanext/datavicmain_home/helpers.py
index 7d852e44..b85e477a 100644
--- a/ckanext/datavicmain_home/helpers.py
+++ b/ckanext/datavicmain_home/helpers.py
@@ -15,8 +15,11 @@ def get_item_by_section_type(section_type: str) -> list[dict[str, Any]]:
         list[dict[str, Any]]: The section items.
     """
 
-    return [
-        item.dictize({})
-        for item in HomeSectionItem.get_by_section(section_type)
-        if item.state == HomeSectionItem.State.active
-    ]
+    return sorted(
+        [
+            item.dictize({})
+            for item in HomeSectionItem.get_by_section(section_type)
+            if item.state == HomeSectionItem.State.active
+        ],
+        key=lambda x: x["weight"],
+    )
diff --git a/ckanext/datavicmain_home/model.py b/ckanext/datavicmain_home/model.py
index 2b8d3fea..47473b4d 100644
--- a/ckanext/datavicmain_home/model.py
+++ b/ckanext/datavicmain_home/model.py
@@ -67,8 +67,8 @@ def dictize(self, context):
             "state": self.state,
             "section_type": self.section_type,
             "weight": self.weight,
-            "created_at": self.created_at,
-            "modified_at": self.modified_at,
+            "created_at": self.modified_at.isoformat(),
+            "modified_at": self.modified_at.isoformat(),
         }
 
     @classmethod
diff --git a/ckanext/datavicmain_home/templates/vic_home/base.html b/ckanext/datavicmain_home/templates/vic_home/base.html
index 12fc7db6..9a2fdb53 100644
--- a/ckanext/datavicmain_home/templates/vic_home/base.html
+++ b/ckanext/datavicmain_home/templates/vic_home/base.html
@@ -7,25 +7,16 @@
 {% endblock %}
 
 {% block primary %}
-    <div class="primary col-sm-9 col-xs-12">
+    <div class="primary col-12">
         {% block primary_content %}
-            <div class="module-content">
-                {% if self.page_primary_action() | trim %}
-                  <div class="page_primary_action">
-                    {% block page_primary_action %}{% endblock %}
-                  </div>
-                {% endif %}
-
-                {% block primary_content_inner %}
-
-                {% endblock %}
-            </div>
+            {% block primary_content_inner %}
+            {% endblock %}
         {% endblock %}
     </div>
 {% endblock %}
 
 {% block secondary %}
-    <aside class="secondary col-sm-3">
+    <aside class="secondary col-12">
         {% block secondary_content %}
             <div class="module module-narrow module-shallow">
                 <h2 class="module-heading">
diff --git a/ckanext/datavicmain_home/views.py b/ckanext/datavicmain_home/views.py
index f05710dd..fefd41d6 100644
--- a/ckanext/datavicmain_home/views.py
+++ b/ckanext/datavicmain_home/views.py
@@ -19,7 +19,7 @@
 
 log = logging.getLogger(__name__)
 
-datavic_home = Blueprint("datavic_home", __name__, url_prefix="/vic/home")
+datavic_home = Blueprint("datavic_home", __name__, url_prefix="/vic-home")
 
 
 class HomeManage(MethodView):

From c8be6f9e1d730ea9824d0e452a7ea7ce7cfc046a Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Tue, 25 Jun 2024 15:31:48 +0300
Subject: [PATCH 13/26] SXDEDPCXZIC-323 / update, fix tests

---
 .../datavicmain_home/assets/css/styles.css    |  9 ++++++
 .../assets/js/vic-entity-file.js              |  2 +-
 ckanext/datavicmain_home/assets/webassets.yml |  6 ++++
 ckanext/datavicmain_home/logic/action.py      | 23 +++++++++----
 ckanext/datavicmain_home/logic/schema.py      | 32 ++++++++++++++++---
 .../scheming/form_snippets/vic_upload.html    |  4 +--
 .../templates/vic_home/base.html              |  6 ++++
 .../templates/vic_home/manage.html            | 10 ++++++
 ckanext/datavicmain_home/tests/conftest.py    | 17 ++++++++--
 ckanext/datavicmain_home/tests/helpers.py     |  3 ++
 .../tests/logic/test_action.py                | 21 +++++++++---
 test.ini                                      |  3 ++
 12 files changed, 115 insertions(+), 21 deletions(-)
 create mode 100644 ckanext/datavicmain_home/assets/css/styles.css
 create mode 100644 ckanext/datavicmain_home/tests/helpers.py

diff --git a/ckanext/datavicmain_home/assets/css/styles.css b/ckanext/datavicmain_home/assets/css/styles.css
new file mode 100644
index 00000000..4fb14ce4
--- /dev/null
+++ b/ckanext/datavicmain_home/assets/css/styles.css
@@ -0,0 +1,9 @@
+.image-preview {
+    position: relative;
+}
+
+.image-preview .vic-remove-image {
+    position: absolute;
+    right: 0;
+    top: 0;
+}
diff --git a/ckanext/datavicmain_home/assets/js/vic-entity-file.js b/ckanext/datavicmain_home/assets/js/vic-entity-file.js
index bb791ef9..b8230485 100644
--- a/ckanext/datavicmain_home/assets/js/vic-entity-file.js
+++ b/ckanext/datavicmain_home/assets/js/vic-entity-file.js
@@ -23,7 +23,7 @@ ckan.module("vic-entity-file", function ($, _) {
                 url: this.sandbox.client.url("/api/action/vic_home_remove_item_image"),
                 type: "POST",
                 data: {
-                    item_id: this.options.itemId
+                    id: this.options.itemId
                 },
                 success: function () {
                     $(".image-preview").children().remove();
diff --git a/ckanext/datavicmain_home/assets/webassets.yml b/ckanext/datavicmain_home/assets/webassets.yml
index f8cb3895..872cc416 100644
--- a/ckanext/datavicmain_home/assets/webassets.yml
+++ b/ckanext/datavicmain_home/assets/webassets.yml
@@ -6,3 +6,9 @@ js-global:
   extra:
     preload:
       - base/main
+
+css-global:
+  filter: rcssmin
+  output: ckanext-alias/%(version)s-vic-home.css
+  contents:
+    - css/styles.css
diff --git a/ckanext/datavicmain_home/logic/action.py b/ckanext/datavicmain_home/logic/action.py
index b10834d8..13db4dd3 100644
--- a/ckanext/datavicmain_home/logic/action.py
+++ b/ckanext/datavicmain_home/logic/action.py
@@ -29,7 +29,9 @@ def create_section_item(
     if "upload" in data_dict:
         upload = data_dict.pop("upload")
 
-        result = tk.get_action("files_file_create")(context, {"upload": upload})
+        result = tk.get_action("files_file_create")(
+            context, {"upload": upload}
+        )
         data_dict["image_id"] = result["id"]
 
     item = HomeSectionItem(**data_dict)
@@ -92,13 +94,17 @@ def update_section_item(
     if "upload" in data_dict:
         if item.image_id:
             try:
-                tk.get_action("files_file_delete")(context, {"id": item.image_id})
+                tk.get_action("files_file_delete")(
+                    context, {"id": item.image_id}
+                )
             except (tk.ValidationError, tk.ObjectNotFound):
                 pass
 
         upload = data_dict.pop("upload")
 
-        result = tk.get_action("files_file_create")(context, {"upload": upload})
+        result = tk.get_action("files_file_create")(
+            context, {"upload": upload}
+        )
         data_dict["image_id"] = result["id"]
 
     for key, value in data_dict.items():
@@ -130,6 +136,7 @@ def get_section_items_by_section_type(
 
     return [item.dictize({}) for item in items]
 
+
 @tk.side_effect_free
 def get_all_section_items(
     context: types.Context, data_dict: types.DataDict
@@ -147,7 +154,10 @@ def get_all_section_items(
 
 
 @tk.side_effect_free
-def get_section_item(context: types.Context, data_dict: types.DataDict) -> dict[str, Any]:
+@validate(schema.get_section_item)
+def get_section_item(
+    context: types.Context, data_dict: types.DataDict
+) -> dict[str, Any]:
     """Get a section item.
 
     Args:
@@ -166,12 +176,11 @@ def get_section_item(context: types.Context, data_dict: types.DataDict) -> dict[
     return item.dictize({})
 
 
+@validate(schema.vic_home_remove_item_image)
 def vic_home_remove_item_image(context, data_dict):
     tk.check_access("manage_home_sections", context, data_dict)
 
-    image_id: str = tk.get_or_bust(tk.request.form, "item_id")
-
-    item = HomeSectionItem.get(image_id)
+    item = HomeSectionItem.get(data_dict["id"])
 
     if not item or not item.image_id:
         return {"success": True}
diff --git a/ckanext/datavicmain_home/logic/schema.py b/ckanext/datavicmain_home/logic/schema.py
index 3eabfedd..aa3a50e0 100644
--- a/ckanext/datavicmain_home/logic/schema.py
+++ b/ckanext/datavicmain_home/logic/schema.py
@@ -19,7 +19,7 @@ def create_section_item(
     one_of,
     ignore,
     url_validator,
-    int_validator
+    int_validator,
 ) -> Schema:
     return {
         "title": [not_empty, unicode_safe],
@@ -75,15 +75,15 @@ def update_section_item(
         "description": [ignore_missing, unicode_safe],
         "upload": [ignore_missing],
         "url": [ignore_missing, url_validator],
-        "entity_url": [not_empty, url_validator],
+        "entity_url": [ignore_missing, url_validator],
         "state": [
-            default(HomeSectionItem.State.active),
+            ignore_missing,
             one_of(
                 [HomeSectionItem.State.active, HomeSectionItem.State.inactive]
             ),
         ],
         "section_type": [
-            default(HomeSectionItem.SectionType.news),
+            ignore_missing,
             one_of(
                 [
                     HomeSectionItem.SectionType.news,
@@ -116,3 +116,27 @@ def get_section_items_by_section_type(
         ],
         "__extras": [ignore],
     }
+
+
+@validator_args
+def get_section_item(
+    not_empty,
+    ignore,
+    home_section_item_exists,
+) -> Schema:
+    return {
+        "id": [not_empty, home_section_item_exists],
+        "__extras": [ignore],
+    }
+
+
+@validator_args
+def vic_home_remove_item_image(
+    not_empty,
+    ignore,
+    home_section_item_exists,
+) -> Schema:
+    return {
+        "id": [not_empty, home_section_item_exists],
+        "__extras": [ignore],
+    }
diff --git a/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
index 0015b69c..6fe584a7 100644
--- a/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
+++ b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_upload.html
@@ -4,7 +4,7 @@
     <label for="upload" class="form-label">{{ _("File") }}</label>
 
     {% if data.image_id %}
-        <div class="controls align-items-center d-flex" data-module="vic-entity-file" data-module-item-id="{{ data.id }}">
+        <div class="controls align-items-center d-flex mb-3" data-module="vic-entity-file" data-module-item-id="{{ data.id }}">
             {% set file_info = h.files_link_details(data.image_id) %}
 
             <div class="image-preview">
@@ -17,7 +17,7 @@
         </div>
     {% endif %}
 
-    <div class="controls mt-3">
+    <div class="controls">
         <input type="file" name="upload" id="file" accept="image/*">
 
         {%- if field.help_text -%}
diff --git a/ckanext/datavicmain_home/templates/vic_home/base.html b/ckanext/datavicmain_home/templates/vic_home/base.html
index 9a2fdb53..0e48e399 100644
--- a/ckanext/datavicmain_home/templates/vic_home/base.html
+++ b/ckanext/datavicmain_home/templates/vic_home/base.html
@@ -34,6 +34,12 @@ <h2 class="module-heading">
     </aside>
 {% endblock %}
 
+{% block styles %}
+    {% asset "vic_home/css-global" %}
+
+    {{ super() }}
+{% endblock %}
+
 {% block scripts %}
     {% asset "vic_home/js-global" %}
 
diff --git a/ckanext/datavicmain_home/templates/vic_home/manage.html b/ckanext/datavicmain_home/templates/vic_home/manage.html
index 7a93f815..9234f530 100644
--- a/ckanext/datavicmain_home/templates/vic_home/manage.html
+++ b/ckanext/datavicmain_home/templates/vic_home/manage.html
@@ -6,9 +6,18 @@
     </p>
 
     <table class="table table-header table-hover table-bordered">
+        <colgroup>
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 50%;">
+            <col span="1" style="width: 10%;">
+            <col span="1" style="width: 10%;">
+            <col span="1" style="width: 10%;">
+         </colgroup>
+
         <thead>
             <tr>
                 <th>{{ _('Title') }}</th>
+                <th>{{ _('Description') }}</th>
                 <th>{{ _('State') }}</th>
                 <th>{{ _('Type') }}</th>
                 <th>{{ _('Actions') }}</th>
@@ -19,6 +28,7 @@
             {% for home_item in home_items %}
                 <tr>
                     <td>{{ home_item.title }}</td>
+                    <td>{{ home_item.description | truncate (70) }}</td>
                     <td>{{ home_item.state }}</td>
                     <td>{{ home_item.section_type }}</td>
                     <td>
diff --git a/ckanext/datavicmain_home/tests/conftest.py b/ckanext/datavicmain_home/tests/conftest.py
index 53e2c1c3..a2c86ae8 100644
--- a/ckanext/datavicmain_home/tests/conftest.py
+++ b/ckanext/datavicmain_home/tests/conftest.py
@@ -1,12 +1,16 @@
+from __future__ import annotations
+
+from io import BytesIO
+
 import pytest
 import factory
-
 from pytest_factoryboy import register
 
-import ckan.model as model
+
 from ckan.tests.factories import CKANFactory
 
 from ckanext.datavicmain_home.model import HomeSectionItem
+from ckanext.datavicmain_home.tests.helpers import MockFileStorage, PNG_IMAGE
 
 
 @pytest.fixture()
@@ -14,6 +18,7 @@ def clean_db(reset_db, migrate_db_for):
     reset_db()
 
     migrate_db_for("datavicmain_home")
+    migrate_db_for("files")
 
 
 @register
@@ -24,7 +29,13 @@ class Meta:
 
     title = factory.Faker("sentence")
     description = factory.Faker("sentence")
-    image_id = factory.Faker("uuid4")
+    # image_id = factory.Faker("uuid4")
+    upload = factory.LazyAttribute(
+        lambda _: MockFileStorage(BytesIO(PNG_IMAGE), "image.png")
+    )
+
     url = factory.Faker("url")
+    entity_url = factory.Faker("url")
     state = HomeSectionItem.State.active
     section_type = HomeSectionItem.SectionType.news
+    weight = 0
diff --git a/ckanext/datavicmain_home/tests/helpers.py b/ckanext/datavicmain_home/tests/helpers.py
new file mode 100644
index 00000000..3a161617
--- /dev/null
+++ b/ckanext/datavicmain_home/tests/helpers.py
@@ -0,0 +1,3 @@
+from werkzeug.datastructures import FileStorage as MockFileStorage  # noqa
+
+PNG_IMAGE = b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\nIDATx\xdac\xf8\x0f\x00\x01\x01\x01\x00\xa7(\xa5\x8d\x00\x00\x00\x00IEND\xaeB`\x82"
diff --git a/ckanext/datavicmain_home/tests/logic/test_action.py b/ckanext/datavicmain_home/tests/logic/test_action.py
index 845db560..7756e3ec 100644
--- a/ckanext/datavicmain_home/tests/logic/test_action.py
+++ b/ckanext/datavicmain_home/tests/logic/test_action.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import TypedDict
+from io import BytesIO
 
 import pytest
 
@@ -8,7 +9,7 @@
 from ckan.tests.helpers import call_action
 
 from ckanext.datavicmain_home.model import HomeSectionItem
-
+from ckanext.datavicmain_home.tests.helpers import MockFileStorage, PNG_IMAGE
 
 class HomeSectionData(TypedDict):
     id: str
@@ -16,8 +17,12 @@ class HomeSectionData(TypedDict):
     description: str
     image_id: str
     url: str
+    entity_url: str
     state: str
     section_type: str
+    weight: int
+    created_at: str
+    modified_at: str
 
 
 @pytest.mark.usefixtures("with_plugins", "clean_db")
@@ -30,7 +35,11 @@ def test_basic_create(self, home_section_item_factory):
         assert home_section_item["description"]
         assert home_section_item["image_id"]
         assert home_section_item["url"]
+        assert home_section_item["entity_url"]
         assert home_section_item["state"] == HomeSectionItem.State.active
+        assert home_section_item["weight"] == 0
+        assert home_section_item["created_at"]
+        assert home_section_item["modified_at"]
         assert (
             home_section_item["section_type"]
             == HomeSectionItem.SectionType.news
@@ -84,28 +93,32 @@ def test_basic_update(self, home_section_item_factory):
 
         new_title = "New title"
         new_description = "New description"
-        new_image_id = "new-image-id"
         new_url = "https://example.com"
         new_state = HomeSectionItem.State.inactive
         new_section_type = HomeSectionItem.SectionType.data
+        new_weight = 11
 
         result = call_action(
             "update_section_item",
             id=home_section_item["id"],
             title=new_title,
             description=new_description,
-            image_id=new_image_id,
+            upload=MockFileStorage(BytesIO(PNG_IMAGE), "image.png"),
             url=new_url,
+            entity_url=new_url,
             state=new_state,
             section_type=new_section_type,
+            weight=new_weight
         )
 
         assert result["title"] == new_title
         assert result["description"] == new_description
-        assert result["image_id"] == new_image_id
+        assert result["image_id"] != home_section_item["image_id"]
         assert result["url"] == new_url
+        assert result["entity_url"] == new_url
         assert result["state"] == new_state
         assert result["section_type"] == new_section_type
+        assert result["weight"] == new_weight
 
     def test_update_with_invalid_url(self, home_section_item_factory):
         home_section_item = home_section_item_factory()
diff --git a/test.ini b/test.ini
index af855d3e..d051a44a 100644
--- a/test.ini
+++ b/test.ini
@@ -15,6 +15,9 @@ ckan.plugins =
              datavicmain_dataset datavicmain_home
              scheming_datasets
              alias
+             files
+
+ckanext.files.storage.default.type = files:redis
 
 scheming.dataset_schemas =
                          ckanext.datavicmain:iar_ckan_dataset.yaml

From 22bd8f05130517e9d54252548bea1a01182a82c3 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Tue, 25 Jun 2024 15:48:16 +0300
Subject: [PATCH 14/26] SXDEDPCXZIC-323 / add url_in_new_tab field

---
 ckanext/datavicmain_home/config_schema.yaml   |  9 ++++
 ckanext/datavicmain_home/logic/schema.py      |  6 ++-
 .../720d557e7d52_init_section_item_table.py   |  1 +
 ckanext/datavicmain_home/model.py             |  7 +--
 .../templates/home/index.html                 | 50 +++++++++++++++++++
 .../scheming/form_snippets/vic_checkbox.html  | 16 ++++++
 6 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 ckanext/datavicmain_home/templates/home/index.html
 create mode 100644 ckanext/datavicmain_home/templates/scheming/form_snippets/vic_checkbox.html

diff --git a/ckanext/datavicmain_home/config_schema.yaml b/ckanext/datavicmain_home/config_schema.yaml
index 58c817df..bb1d17eb 100644
--- a/ckanext/datavicmain_home/config_schema.yaml
+++ b/ckanext/datavicmain_home/config_schema.yaml
@@ -46,6 +46,15 @@ fields:
     classes:
       - control-full
 
+  - field_name: url_in_new_tab
+    label: New tab
+    form_snippet: vic_checkbox.html
+    help_text: If checked, the URL will be opened in a new tab.
+    classes:
+      - control-full
+    validators: boolean_validator
+    output_validators: convert_to_json_if_string
+
   - field_name: section_type
     label: Type
     preset: select
diff --git a/ckanext/datavicmain_home/logic/schema.py b/ckanext/datavicmain_home/logic/schema.py
index aa3a50e0..617be488 100644
--- a/ckanext/datavicmain_home/logic/schema.py
+++ b/ckanext/datavicmain_home/logic/schema.py
@@ -4,7 +4,6 @@
 
 from ckan.logic.schema import validator_args
 
-from ckan.logic.validators import int_validator
 from ckanext.datavicmain_home.model import HomeSectionItem
 
 Schema = Dict[str, Any]
@@ -20,6 +19,7 @@ def create_section_item(
     ignore,
     url_validator,
     int_validator,
+    boolean_validator,
 ) -> Schema:
     return {
         "title": [not_empty, unicode_safe],
@@ -44,6 +44,7 @@ def create_section_item(
             ),
         ],
         "weight": [default(0), int_validator],
+        "url_in_new_tab": [default(False), boolean_validator],
         "__extras": [ignore],
     }
 
@@ -67,6 +68,8 @@ def update_section_item(
     ignore,
     default,
     url_validator,
+    int_validator,
+    boolean_validator,
     home_section_item_exists,
 ) -> Schema:
     return {
@@ -93,6 +96,7 @@ def update_section_item(
             ),
         ],
         "weight": [default(0), int_validator],
+        "url_in_new_tab": [default(False), boolean_validator],
         "__extras": [ignore],
     }
 
diff --git a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
index 68d30be2..6cd67ca0 100644
--- a/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
+++ b/ckanext/datavicmain_home/migration/datavicmain_home/versions/720d557e7d52_init_section_item_table.py
@@ -31,6 +31,7 @@ def upgrade():
         sa.Column("weight", sa.Integer(), nullable=False),
         sa.Column("created_at", sa.DateTime(), nullable=False),
         sa.Column("modified_at", sa.DateTime(), nullable=False),
+        sa.Column("url_in_new_tab", sa.Boolean(), nullable=False),
         sa.PrimaryKeyConstraint("id"),
     )
 
diff --git a/ckanext/datavicmain_home/model.py b/ckanext/datavicmain_home/model.py
index 47473b4d..e54e0700 100644
--- a/ckanext/datavicmain_home/model.py
+++ b/ckanext/datavicmain_home/model.py
@@ -2,13 +2,12 @@
 
 import logging
 from datetime import datetime
-from typing import Any
 
 from ckan import model
 from ckan.model.types import make_uuid
 from ckan.plugins import toolkit as tk
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, Text
-from sqlalchemy.orm import Query, relationship
+from sqlalchemy import Boolean, Column, DateTime, Integer, Text
+from sqlalchemy.orm import Query
 from typing_extensions import Self
 
 
@@ -39,6 +38,7 @@ class SectionType:
     weight = Column(Integer, nullable=False, default=0)
     created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
     modified_at = Column(DateTime, nullable=False, default=datetime.utcnow)
+    url_in_new_tab = Column(Boolean, nullable=False, default=False)
 
     def __repr__(self):
         return f"HomeSectionItem(title={self.title})"
@@ -69,6 +69,7 @@ def dictize(self, context):
             "weight": self.weight,
             "created_at": self.modified_at.isoformat(),
             "modified_at": self.modified_at.isoformat(),
+            "url_in_new_tab": self.url_in_new_tab,
         }
 
     @classmethod
diff --git a/ckanext/datavicmain_home/templates/home/index.html b/ckanext/datavicmain_home/templates/home/index.html
new file mode 100644
index 00000000..27250402
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/home/index.html
@@ -0,0 +1,50 @@
+{% ckan_extends %}
+
+{% block vic_home_content %}
+    <section class="cards">
+        <div class="container">
+            {% set sections = {
+                "news": "Datavic news, events and updates",
+                "data": "Browse by data category",
+                "resources": "Resources"}
+            %}
+
+            {% for type, title in sections.items() %}
+                {% set items = h.get_item_by_section_type(type) %}
+
+                {% if items %}
+                    <div class="section-type">
+                        <h2>{{ title }}</h2>
+
+                        <div class="row row-cols-1 row-cols-md-3 g-4">
+                            {% for item in items %}
+                                <div class="col">
+                                    <div class="card">
+                                        {% if item.image_id %}
+                                            {% set file_info = h.files_link_details(item.image_id) %}
+
+                                            {% if file_info %}
+                                                <img src="{{ file_info.href }}" loading="lazy" fetchpriority="auto" alt="Item image">
+                                            {% endif %}
+                                        {% elif item.url %}
+                                            <img src="{{ item.url }}" loading="lazy" fetchpriority="auto" alt="Item image">
+                                        {% endif %}
+
+                                        <div class="card-body">
+                                            <h5 class="card-title">
+                                                <a class="stretched-link" href="https://www.data.vic.gov.au/" {% if item.url_in_new_tab %}target="_blank"{% endif    %}>{{ item.title }}</a>
+                                            </h5>
+                                            <p class="card-text">
+                                                {{ item.description }}
+                                            </p>
+                                        </div>
+                                    </div>
+                                </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                {% endif %}
+            {% endfor %}
+        </div>
+    </section>
+{% endblock %}
diff --git a/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_checkbox.html b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_checkbox.html
new file mode 100644
index 00000000..b878cc68
--- /dev/null
+++ b/ckanext/datavicmain_home/templates/scheming/form_snippets/vic_checkbox.html
@@ -0,0 +1,16 @@
+{% set val = data[field.field_name] %}
+<div class="form-group">
+	<label for="field-{{ field.field_name }}" class="form-label">
+        {{ field.label }}
+	</label>
+    <div class="controls">
+        <input id="field-{{ field.field_name }}"
+            type="checkbox"
+            name="{{ field.field_name }}"
+            value="true"
+            {{"checked " if (val is string and 'true' in val) or val }}
+        />
+
+    	{%- snippet 'scheming/form_snippets/help_text.html', field=field -%}
+    </div>
+</div>

From 585fc2ba9f5b5d8b9ac075475f2e878fb8d388ac Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Tue, 25 Jun 2024 15:57:34 +0300
Subject: [PATCH 15/26] SXDEDPCXZIC-323 / update tests

---
 ckanext/datavicmain_home/tests/logic/test_action.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ckanext/datavicmain_home/tests/logic/test_action.py b/ckanext/datavicmain_home/tests/logic/test_action.py
index 7756e3ec..ea862ee2 100644
--- a/ckanext/datavicmain_home/tests/logic/test_action.py
+++ b/ckanext/datavicmain_home/tests/logic/test_action.py
@@ -23,6 +23,7 @@ class HomeSectionData(TypedDict):
     weight: int
     created_at: str
     modified_at: str
+    url_in_new_tab: bool
 
 
 @pytest.mark.usefixtures("with_plugins", "clean_db")
@@ -40,6 +41,7 @@ def test_basic_create(self, home_section_item_factory):
         assert home_section_item["weight"] == 0
         assert home_section_item["created_at"]
         assert home_section_item["modified_at"]
+        assert home_section_item["url_in_new_tab"] == False
         assert (
             home_section_item["section_type"]
             == HomeSectionItem.SectionType.news
@@ -108,7 +110,8 @@ def test_basic_update(self, home_section_item_factory):
             entity_url=new_url,
             state=new_state,
             section_type=new_section_type,
-            weight=new_weight
+            weight=new_weight,
+            url_in_new_tab=True,
         )
 
         assert result["title"] == new_title
@@ -119,6 +122,7 @@ def test_basic_update(self, home_section_item_factory):
         assert result["state"] == new_state
         assert result["section_type"] == new_section_type
         assert result["weight"] == new_weight
+        assert result["url_in_new_tab"] == True
 
     def test_update_with_invalid_url(self, home_section_item_factory):
         home_section_item = home_section_item_factory()

From 111727c248731af75cfb18b8dafbc9b20cc1643c Mon Sep 17 00:00:00 2001
From: alexmorev <aleksey.morev@linkdigital.com.au>
Date: Tue, 25 Jun 2024 22:09:23 +0300
Subject: [PATCH 16/26] SXDEDPCXZIC-320_DATAVIC-698 / hide DTV map preview for
 any file over 150MB

---
 ckanext/datavicmain/config.py                 | 19 ++++++++++++++
 ckanext/datavicmain/helpers.py                | 26 ++++++++++++++++++-
 ckanext/datavicmain/plugins.py                |  1 +
 .../package/snippets/datavic_dtv.html         |  3 ++-
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 ckanext/datavicmain/config.py

diff --git a/ckanext/datavicmain/config.py b/ckanext/datavicmain/config.py
new file mode 100644
index 00000000..8e349eea
--- /dev/null
+++ b/ckanext/datavicmain/config.py
@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+import ckan.plugins.toolkit as tk
+
+CONFIG_PAGES_BASE_URL = "ckan.pages.base_url"
+CONFIG_DTV_URL = "ckanext.datavicmain.dtv.url"
+CONFIG_DTV_MAX_SIZE_LIMIT = "ckanext.datavicmain.dtv.max_size_limit"
+
+
+def get_pages_base_url() -> str:
+    return tk.config[CONFIG_PAGES_BASE_URL]
+
+
+def get_dtv_url() -> str:
+    return tk.config.get(CONFIG_DTV_URL, "")
+
+
+def get_dtv_max_size_limit() -> int:
+    return tk.config.get(CONFIG_DTV_MAX_SIZE_LIMIT, "157286400")
diff --git a/ckanext/datavicmain/helpers.py b/ckanext/datavicmain/helpers.py
index 18320abd..abf8d969 100644
--- a/ckanext/datavicmain/helpers.py
+++ b/ckanext/datavicmain/helpers.py
@@ -19,7 +19,7 @@
 
 from ckanext.harvest.model import HarvestObject
 from ckanext.activity.model.activity import Activity
-from . import utils
+from . import utils, config as conf
 
 config = toolkit.config
 request = toolkit.request
@@ -339,3 +339,27 @@ def get_group(group: Optional[str] = None,
         )
     except (toolkit.NotFound, toolkit.ValidationError, toolkit.NotAuthorized):
         return {}
+
+
+def dtv_exceeds_max_size_limit(resource_id: str) -> bool:
+    """Check if DTV resource exceeds the maximum file size limit
+
+    Args:
+        resource_id (str): DTV resource id
+
+    Returns:
+        bool: return True if dtv resource exceeds maximum file size limit set
+            in ckan config "ckanext.datavicmain.dtv.max_size_limit",
+            otherwise - False  
+    """
+    try:
+        resource = toolkit.get_action("resource_show")({}, {"id": resource_id})
+    except (toolkit.ObjectNotFound, toolkit.NotAuthorized):
+        return True
+
+    limit = conf.get_dtv_max_size_limit()
+    filesize = resource.get("filesize")
+    if filesize and int(filesize) >= int(limit):
+        return True
+
+    return False
diff --git a/ckanext/datavicmain/plugins.py b/ckanext/datavicmain/plugins.py
index 71620321..9e99a26f 100644
--- a/ckanext/datavicmain/plugins.py
+++ b/ckanext/datavicmain/plugins.py
@@ -239,6 +239,7 @@ def get_helpers(self):
             'url_for_dtv_config': helpers.url_for_dtv_config,
             "datavic_org_uploads_allowed": helpers.datavic_org_uploads_allowed,
             "get_group": helpers.get_group,
+            "dtv_exceeds_max_size_limit": helpers.dtv_exceeds_max_size_limit,
         }
 
     ## IConfigurer interface ##
diff --git a/ckanext/datavicmain/templates/package/snippets/datavic_dtv.html b/ckanext/datavicmain/templates/package/snippets/datavic_dtv.html
index 21240515..519b2179 100644
--- a/ckanext/datavicmain/templates/package/snippets/datavic_dtv.html
+++ b/ckanext/datavicmain/templates/package/snippets/datavic_dtv.html
@@ -1,7 +1,8 @@
 {% set dtv_resources = h.get_digital_twin_resources(pkg.id)|map(attribute="id")|list %}
 {% set dtv_preview = pkg.dtv_preview %}
+{% set dtv_exceeds_limit = h.dtv_exceeds_max_size_limit(dtv_resources[0]) %}
 
-{% if dtv_resources and dtv_preview is not sameas false %}
+{% if dtv_resources and not dtv_exceeds_limit and dtv_preview is not sameas false %}
     <section class="datapreview resource-preview">
         <div class="header-container">
             <h3>{{ _('Map preview') }}</h3>

From a8ea73c38f510c6a988c6b1a618a728f1a4734e8 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Thu, 27 Jun 2024 08:37:49 +0300
Subject: [PATCH 17/26] DATAVIC-597_SXDEDPCXZIC-323 / fix entity url redirect

---
 ckanext/datavicmain_home/templates/home/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datavicmain_home/templates/home/index.html b/ckanext/datavicmain_home/templates/home/index.html
index 27250402..5e44c840 100644
--- a/ckanext/datavicmain_home/templates/home/index.html
+++ b/ckanext/datavicmain_home/templates/home/index.html
@@ -32,7 +32,7 @@ <h2>{{ title }}</h2>
 
                                         <div class="card-body">
                                             <h5 class="card-title">
-                                                <a class="stretched-link" href="https://www.data.vic.gov.au/" {% if item.url_in_new_tab %}target="_blank"{% endif    %}>{{ item.title }}</a>
+                                                <a class="stretched-link" href="{{ item.entity_url }}" {% if item.url_in_new_tab %}target="_blank"{% endif    %}>{{ item.title }}</a>
                                             </h5>
                                             <p class="card-text">
                                                 {{ item.description }}

From 8fb774139ea17d46250f9bd7574017b513d20b0a Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Mon, 1 Jul 2024 10:34:16 +0300
Subject: [PATCH 18/26] SXDEDPCXZIC-323 / allow arbitrary section names

---
 ckanext/datavicmain_home/config_schema.yaml   |  6 ++-
 ckanext/datavicmain_home/helpers.py           | 10 ++++
 ckanext/datavicmain_home/logic/schema.py      | 35 ++------------
 ckanext/datavicmain_home/model.py             | 20 ++++++--
 .../templates/home/index.html                 | 12 ++---
 .../templates/vic_home/manage.html            |  4 +-
 .../tests/logic/test_action.py                | 27 +----------
 .../datavicmain_home/tests/test_helpers.py    | 45 ++++++++++++++++++
 ckanext/datavicmain_home/tests/test_utils.py  |  9 ++++
 ckanext/datavicmain_home/views.py             | 47 +++++++++++++++----
 10 files changed, 132 insertions(+), 83 deletions(-)
 create mode 100644 ckanext/datavicmain_home/tests/test_helpers.py
 create mode 100644 ckanext/datavicmain_home/tests/test_utils.py

diff --git a/ckanext/datavicmain_home/config_schema.yaml b/ckanext/datavicmain_home/config_schema.yaml
index bb1d17eb..e189faad 100644
--- a/ckanext/datavicmain_home/config_schema.yaml
+++ b/ckanext/datavicmain_home/config_schema.yaml
@@ -57,7 +57,6 @@ fields:
 
   - field_name: section_type
     label: Type
-    preset: select
     required: true
     choices:
       - value: news
@@ -67,8 +66,11 @@ fields:
       - value: resources
         label: Resource
     help_text: The type of the item. Defines in which section of the home page the item will be displayed.
+    validators: not_empty unicode_safe
     form_attrs:
-      required: 1
+      data-module: "autocomplete"
+      data-module-source: "/vic-home/section_autocomplete?incomplete=?"
+      class: ""
     classes:
       - control-full
 
diff --git a/ckanext/datavicmain_home/helpers.py b/ckanext/datavicmain_home/helpers.py
index b85e477a..770b2a80 100644
--- a/ckanext/datavicmain_home/helpers.py
+++ b/ckanext/datavicmain_home/helpers.py
@@ -23,3 +23,13 @@ def get_item_by_section_type(section_type: str) -> list[dict[str, Any]]:
         ],
         key=lambda x: x["weight"],
     )
+
+
+def vic_home_get_sections() -> list[str]:
+    """Get all section types.
+
+    Returns:
+        list[str]: The section types.
+    """
+
+    return HomeSectionItem.get_all_section_types()
diff --git a/ckanext/datavicmain_home/logic/schema.py b/ckanext/datavicmain_home/logic/schema.py
index 617be488..1e474c21 100644
--- a/ckanext/datavicmain_home/logic/schema.py
+++ b/ckanext/datavicmain_home/logic/schema.py
@@ -33,16 +33,7 @@ def create_section_item(
                 [HomeSectionItem.State.active, HomeSectionItem.State.inactive]
             ),
         ],
-        "section_type": [
-            default(HomeSectionItem.SectionType.news),
-            one_of(
-                [
-                    HomeSectionItem.SectionType.news,
-                    HomeSectionItem.SectionType.data,
-                    HomeSectionItem.SectionType.resources,
-                ]
-            ),
-        ],
+        "section_type": [not_empty, unicode_safe],
         "weight": [default(0), int_validator],
         "url_in_new_tab": [default(False), boolean_validator],
         "__extras": [ignore],
@@ -85,16 +76,7 @@ def update_section_item(
                 [HomeSectionItem.State.active, HomeSectionItem.State.inactive]
             ),
         ],
-        "section_type": [
-            ignore_missing,
-            one_of(
-                [
-                    HomeSectionItem.SectionType.news,
-                    HomeSectionItem.SectionType.data,
-                    HomeSectionItem.SectionType.resources,
-                ]
-            ),
-        ],
+        "section_type": [ignore_missing, unicode_safe],
         "weight": [default(0), int_validator],
         "url_in_new_tab": [default(False), boolean_validator],
         "__extras": [ignore],
@@ -104,20 +86,11 @@ def update_section_item(
 @validator_args
 def get_section_items_by_section_type(
     not_empty,
-    one_of,
+    unicode_safe,
     ignore,
 ) -> Schema:
     return {
-        "section_type": [
-            not_empty,
-            one_of(
-                [
-                    HomeSectionItem.SectionType.news,
-                    HomeSectionItem.SectionType.data,
-                    HomeSectionItem.SectionType.resources,
-                ]
-            ),
-        ],
+        "section_type": [not_empty, unicode_safe],
         "__extras": [ignore],
     }
 
diff --git a/ckanext/datavicmain_home/model.py b/ckanext/datavicmain_home/model.py
index e54e0700..470fcfbe 100644
--- a/ckanext/datavicmain_home/model.py
+++ b/ckanext/datavicmain_home/model.py
@@ -22,9 +22,9 @@ class State:
         inactive = "inactive"
 
     class SectionType:
-        news = "news"
-        data = "data"
-        resources = "resources"
+        news = "Datavic news, events and updates"
+        data = "Browse by data category"
+        resources = "Resources"
 
     id = Column(Text, primary_key=True, default=make_uuid)
 
@@ -88,6 +88,18 @@ def get_by_section(cls, section_type: str) -> list[Self]:
 
     @classmethod
     def all(cls) -> list[Self]:
-        query: Query = model.Session.query(cls)
+        query: Query = model.Session.query(cls).order_by(cls.weight)
 
         return query.all()
+
+    @classmethod
+    def get_all_section_types(cls) -> list[str]:
+        result = []
+
+        for item in cls.all():
+            if item.section_type in result:
+                continue
+
+            result.append(item.section_type)
+
+        return result
diff --git a/ckanext/datavicmain_home/templates/home/index.html b/ckanext/datavicmain_home/templates/home/index.html
index 27250402..d7f562f1 100644
--- a/ckanext/datavicmain_home/templates/home/index.html
+++ b/ckanext/datavicmain_home/templates/home/index.html
@@ -3,18 +3,12 @@
 {% block vic_home_content %}
     <section class="cards">
         <div class="container">
-            {% set sections = {
-                "news": "Datavic news, events and updates",
-                "data": "Browse by data category",
-                "resources": "Resources"}
-            %}
-
-            {% for type, title in sections.items() %}
-                {% set items = h.get_item_by_section_type(type) %}
+            {% for section_title in h.vic_home_get_sections() %}
+                {% set items = h.get_item_by_section_type(section_title) %}
 
                 {% if items %}
                     <div class="section-type">
-                        <h2>{{ title }}</h2>
+                        <h2>{{ section_title }}</h2>
 
                         <div class="row row-cols-1 row-cols-md-3 g-4">
                             {% for item in items %}
diff --git a/ckanext/datavicmain_home/templates/vic_home/manage.html b/ckanext/datavicmain_home/templates/vic_home/manage.html
index 9234f530..0f4a0c6b 100644
--- a/ckanext/datavicmain_home/templates/vic_home/manage.html
+++ b/ckanext/datavicmain_home/templates/vic_home/manage.html
@@ -8,9 +8,9 @@
     <table class="table table-header table-hover table-bordered">
         <colgroup>
             <col span="1" style="width: 20%;">
-            <col span="1" style="width: 50%;">
-            <col span="1" style="width: 10%;">
+            <col span="1" style="width: 30%;">
             <col span="1" style="width: 10%;">
+            <col span="1" style="width: 30%;">
             <col span="1" style="width: 10%;">
          </colgroup>
 
diff --git a/ckanext/datavicmain_home/tests/logic/test_action.py b/ckanext/datavicmain_home/tests/logic/test_action.py
index ea862ee2..d8cdf889 100644
--- a/ckanext/datavicmain_home/tests/logic/test_action.py
+++ b/ckanext/datavicmain_home/tests/logic/test_action.py
@@ -11,6 +11,7 @@
 from ckanext.datavicmain_home.model import HomeSectionItem
 from ckanext.datavicmain_home.tests.helpers import MockFileStorage, PNG_IMAGE
 
+
 class HomeSectionData(TypedDict):
     id: str
     title: str
@@ -42,10 +43,7 @@ def test_basic_create(self, home_section_item_factory):
         assert home_section_item["created_at"]
         assert home_section_item["modified_at"]
         assert home_section_item["url_in_new_tab"] == False
-        assert (
-            home_section_item["section_type"]
-            == HomeSectionItem.SectionType.news
-        )
+        assert home_section_item["section_type"]
 
     def test_create_with_invalid_url(self, home_section_item_factory):
         with pytest.raises(tk.ValidationError):
@@ -55,10 +53,6 @@ def test_create_with_invalid_state(self, home_section_item_factory):
         with pytest.raises(tk.ValidationError):
             home_section_item_factory(state="invalid-state")
 
-    def test_create_with_invalid_section_type(self, home_section_item_factory):
-        with pytest.raises(tk.ValidationError):
-            home_section_item_factory(section_type="invalid-section-type")
-
     def test_create_without_title(self, home_section_item_factory):
         with pytest.raises(tk.ValidationError):
             home_section_item_factory(title="")
@@ -144,16 +138,6 @@ def test_update_with_invalid_state(self, home_section_item_factory):
                 state="invalid-state",
             )
 
-    def test_update_with_invalid_section_type(self, home_section_item_factory):
-        home_section_item = home_section_item_factory()
-
-        with pytest.raises(tk.ValidationError):
-            call_action(
-                "update_section_item",
-                id=home_section_item["id"],
-                section_type="invalid-section-type",
-            )
-
     def test_update_without_title(self, home_section_item_factory):
         home_section_item = home_section_item_factory()
 
@@ -189,13 +173,6 @@ def test_get_items_by_section_type(self, home_section_item_factory):
 
         assert result[0]["id"] == home_section_item["id"]
 
-    def test_get_items_by_invalid_section_type(self):
-        with pytest.raises(tk.ValidationError):
-            call_action(
-                "get_section_items_by_section_type",
-                section_type="invalid-section-type",
-            )
-
     def test_no_items(self):
         result = call_action(
             "get_section_items_by_section_type",
diff --git a/ckanext/datavicmain_home/tests/test_helpers.py b/ckanext/datavicmain_home/tests/test_helpers.py
new file mode 100644
index 00000000..b84f4a55
--- /dev/null
+++ b/ckanext/datavicmain_home/tests/test_helpers.py
@@ -0,0 +1,45 @@
+import pytest
+
+import ckan.plugins.toolkit as tk
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestGetHomeSections:
+    def test_no_items(self):
+        assert not tk.h.vic_home_get_sections()
+
+    def test_one_item(self, home_section_item_factory):
+        home_section_item = home_section_item_factory(section_type="test")
+        assert tk.h.vic_home_get_sections() == [
+            home_section_item["section_type"]
+        ]
+
+    def test_reoder(self, home_section_item_factory):
+        home_section_item_factory(section_type="test")
+        home_section_item_factory(section_type="test 2", weight="-1")
+
+        assert tk.h.vic_home_get_sections() == ["test 2", "test"]
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestGetSectionItemsBySectionType:
+    def test_no_items(self):
+        assert not tk.h.get_item_by_section_type("test")
+
+    def test_one_item(self, home_section_item_factory):
+        home_section_item = home_section_item_factory(section_type="test")
+
+        assert tk.h.get_item_by_section_type("test") == [home_section_item]
+
+    def test_two_items(self, home_section_item_factory):
+        home_section_item_factory(section_type="test")
+        home_section_item_factory(section_type="test")
+
+        assert len(tk.h.get_item_by_section_type("test")) == 2
+
+    def test_two_items_different_section(self, home_section_item_factory):
+        home_section_item_factory(section_type="test")
+        home_section_item_factory(section_type="test 2")
+
+        assert len(tk.h.get_item_by_section_type("test 2")) == 1
+        assert len(tk.h.get_item_by_section_type("test")) == 1
diff --git a/ckanext/datavicmain_home/tests/test_utils.py b/ckanext/datavicmain_home/tests/test_utils.py
new file mode 100644
index 00000000..812c905f
--- /dev/null
+++ b/ckanext/datavicmain_home/tests/test_utils.py
@@ -0,0 +1,9 @@
+from ckanext.datavicmain_home.utils import get_config_schema
+
+
+class TestGetConfigSchema:
+    def test_get_config_schema(self):
+        schema = get_config_schema()
+
+        assert schema
+        assert isinstance(schema, dict)
diff --git a/ckanext/datavicmain_home/views.py b/ckanext/datavicmain_home/views.py
index fefd41d6..7b83b82f 100644
--- a/ckanext/datavicmain_home/views.py
+++ b/ckanext/datavicmain_home/views.py
@@ -1,13 +1,12 @@
-# encoding: utf-8
 from __future__ import annotations
 
 import logging
-from typing import Union, Any
+from typing import Union, Any, cast
 
 from flask.views import MethodView
-from flask import Blueprint
+from flask import Blueprint, jsonify
 
-from ckan import types
+from ckan import types, model
 from ckan.plugins import toolkit as tk
 from ckan.types import Response
 from ckan.logic import parse_params
@@ -39,10 +38,11 @@ def post(self) -> Union[str, Response]:
 
 class HomeItemCreateOrUpdate(MethodView):
     def validate_data(
-        self, data: dict[str, Any], schema: dict[str, Any]
+        self,
+        data: dict[str, Any],
+        schema: dict[str, Any],
+        errors: types.FlattenErrorDict,
     ) -> tuple[dict[str, Any], types.FlattenErrorDict]:
-        errors: types.FlattenErrorDict = dict((key, []) for key in data)
-
         for field_name in data:
             field: dict[str, Any] | None = tk.h.scheming_field_by_name(
                 schema["fields"], field_name
@@ -57,7 +57,10 @@ def validate_data(
             for validator in validators_from_string(
                 field["validators"], field, schema
             ):
-                convert(validator, field_name, data, errors, context={})
+                try:
+                    convert(validator, field_name, data, errors, context={})
+                except tk.StopOnError:
+                    return data, errors
 
         return data, errors
 
@@ -80,7 +83,8 @@ def post(self) -> Union[str, Response]:
         if file := tk.request.files.get("upload"):
             data["upload"] = file
 
-        data, errors = self.validate_data(data, schema)
+        errors: types.FlattenErrorDict = dict((key, []) for key in data)
+        data, errors = self.validate_data(data, schema, errors)
 
         if any(list(errors.values())):
             return tk.render(
@@ -131,7 +135,8 @@ def post(self, item_id: str) -> Union[str, Response]:
 
         data["id"] = item_id
 
-        data, errors = self.validate_data(data, schema)
+        errors: types.FlattenErrorDict = dict((key, []) for key in data)
+        data, errors = self.validate_data(data, schema, errors)
 
         if any(list(errors.values())):
             return tk.render(
@@ -163,6 +168,25 @@ def post(self, item_id: str) -> Union[str, Response]:
 
         return tk.redirect_to("datavic_home.manage")
 
+
+def section_autocomplete() -> Response:
+    q = tk.request.args.get("incomplete", "")
+
+    if not q:
+        return jsonify({"ResultSet": {"Result": []}})
+
+    return jsonify(
+        {
+            "ResultSet": {
+                "Result": [
+                    {"Name": section}
+                    for section in tk.h.vic_home_get_sections()
+                ]
+            }
+        }
+    )
+
+
 datavic_home.add_url_rule("/manage", view_func=HomeManage.as_view("manage"))
 datavic_home.add_url_rule("/new", view_func=HomeItemCreate.as_view("new"))
 datavic_home.add_url_rule(
@@ -171,3 +195,6 @@ def post(self, item_id: str) -> Union[str, Response]:
 datavic_home.add_url_rule(
     "/delete/<item_id>", view_func=HomeItemDelete.as_view("delete")
 )
+datavic_home.add_url_rule(
+    "/section_autocomplete", view_func=section_autocomplete
+)

From 4744eab983ccbfb53bf4588107b05d9fb8c25d86 Mon Sep 17 00:00:00 2001
From: oleksandrivaniuk <oleksandr.ivaniuk@linkdigital.com.au>
Date: Thu, 4 Jul 2024 17:25:54 +0300
Subject: [PATCH 19/26] SXDEDPCXZIC-313_DATAVIC-635 / fix dataset read template
 issue

---
 ckanext/datavicmain/templates/package/read.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ckanext/datavicmain/templates/package/read.html b/ckanext/datavicmain/templates/package/read.html
index ab4cbe50..8480e755 100644
--- a/ckanext/datavicmain/templates/package/read.html
+++ b/ckanext/datavicmain/templates/package/read.html
@@ -20,9 +20,6 @@ <h1>
     {% endblock %}
 {% endblock %}
 
-{% block package_tags %}
-{% endblock %}
-
 {% block package_resources %}
   {% set grouped_resources = h.group_resources_by_temporal_range(pkg.resources) %}
 

From 8cf4f809771fb97cb6ebf4032f3eb0de9ef83e00 Mon Sep 17 00:00:00 2001
From: alexmorev <aleksey.morev@linkdigital.com.au>
Date: Fri, 27 Sep 2024 01:36:15 +0300
Subject: [PATCH 20/26] SXDEDPCXZIC-372 / fix collaborator issue

---
 ckanext/datavicmain/logic/auth.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ckanext/datavicmain/logic/auth.py b/ckanext/datavicmain/logic/auth.py
index c6cc0a68..f11e5fcb 100644
--- a/ckanext/datavicmain/logic/auth.py
+++ b/ckanext/datavicmain/logic/auth.py
@@ -112,8 +112,19 @@ def _has_user_capacity_in_org(org_id: str, roles: list) -> bool:
 
 @toolkit.chained_auth_function
 def package_activity_list(next_auth, context, data_dict):
+    pkg_dict = toolkit.get_action("package_show")(
+        context,
+        {"id": data_dict["id"]},
+    )
     allowed_roles = ["admin", "editor"]
-    if _has_user_capacity_in_org(context["package"].owner_org, allowed_roles):
+    is_user_collaborator = authz.user_is_collaborator_on_dataset(
+        toolkit.current_user.id, pkg_dict["id"], allowed_roles
+    )
+    has_user_capacity = _has_user_capacity_in_org(
+        pkg_dict["owner_org"], allowed_roles
+    )
+
+    if has_user_capacity or is_user_collaborator:
         return next_auth(context, data_dict)
     return {"success": False}
 

From 8579e304dfd637a541d77c9f4a7b960df3e017d1 Mon Sep 17 00:00:00 2001
From: alexmorev <aleksey.morev@linkdigital.com.au>
Date: Mon, 14 Oct 2024 21:33:26 +0300
Subject: [PATCH 21/26] SXDEDPCXZIC-380 / enhancements to restricted orgs

---
 ckanext/datavicmain/organisation_schema.yaml  | 10 +++--
 .../scheming/form_snippets/org_hierarchy.html |  6 ++-
 .../datavicmain-organization-visibility.js    | 42 +++++++------------
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/ckanext/datavicmain/organisation_schema.yaml b/ckanext/datavicmain/organisation_schema.yaml
index 8ef1ee04..c734fb40 100644
--- a/ckanext/datavicmain/organisation_schema.yaml
+++ b/ckanext/datavicmain/organisation_schema.yaml
@@ -10,6 +10,7 @@ fields:
     form_attrs:
       data-module: slug-preview-target
     form_placeholder: My Organization
+    required: true
 
   - field_name: name
     label: URL
@@ -28,10 +29,6 @@ fields:
     validators: scheming_required
     form_placeholder: http://example.com/my-image.jpg
 
-  - field_name: parent
-    label: Parent
-    form_snippet: org_hierarchy.html
-
   - field_name: visibility
     label: Visibility
     form_snippet: vic_org_visibility.html
@@ -43,3 +40,8 @@ fields:
       label: Unrestricted
     - value: restricted
       label: Restricted
+
+  - field_name: parent
+    label: Parent
+    form_snippet: org_hierarchy.html
+    required: true
diff --git a/ckanext/datavicmain/templates/scheming/form_snippets/org_hierarchy.html b/ckanext/datavicmain/templates/scheming/form_snippets/org_hierarchy.html
index eccd5cf8..05c90baa 100644
--- a/ckanext/datavicmain/templates/scheming/form_snippets/org_hierarchy.html
+++ b/ckanext/datavicmain/templates/scheming/form_snippets/org_hierarchy.html
@@ -6,7 +6,11 @@
     {% set visibility = data.visibility or "unrestricted" %}
 {% endif %}
 
-{% call form.input_block("field-parent", label=_("Parent")) %}
+{% call form.input_block(
+    "field-parent",
+    label=_("Parent"),
+    is_required=h.scheming_field_required(field))
+%}
     <select id="field-parent" name="groups__0__name" data-module="autocomplete datavicmain-organization-visibility">
         {% set selected_parent = (data.get('groups') or [{'name': ''}])[0]['name'] %} {{ selected_parent }}
         <option value="" {% if not selected_parent %} selected="selected" {% endif %}>
diff --git a/ckanext/datavicmain/webassets/datavicmain-organization-visibility.js b/ckanext/datavicmain/webassets/datavicmain-organization-visibility.js
index e7389fa6..c0b6228c 100644
--- a/ckanext/datavicmain/webassets/datavicmain-organization-visibility.js
+++ b/ckanext/datavicmain/webassets/datavicmain-organization-visibility.js
@@ -4,39 +4,25 @@ this.ckan.module("datavicmain-organization-visibility", function ($) {
     return {
         options: {},
         initialize: function () {
-            var selectedOption = $("option[selected=selected]");
-
-            if (selectedOption.hasClass("restricted")) {
-                $(".select2-chosen").addClass("restricted");
+            if ($("#field-visibility").val() == "unrestricted") {
+                $("#field-parent option.restricted").addClass("hide");
+                $("#field-parent option:not('.restricted')").removeClass("hide");
             };
 
             $("#field-visibility[readonly=true]").find("option:not(:selected)").attr("disabled", true);
 
-            $("#field-parent").on('change', function (e) {
-                var orgName = $("#select2-chosen-1").text();
-                var topLevel = "None - top level";
-
-                if ($("#field-visibility").attr("readonly")) {
-                } else if ($("#field-parent option:contains('" + orgName + "')").hasClass("restricted")) {
-                    $("#select2-chosen-1").addClass("restricted");
-                    $("#field-visibility option[value='unrestricted']").attr("selected", false);
-                    $("#field-visibility option[value='restricted']").attr("selected", true);
-                    $("#field-visibility option[value='unrestricted']").attr("disabled", true);
-                    $("#field-visibility option[value='restricted']").attr("disabled", false);
-                } else if ($("#select2-chosen-1:contains('" +  topLevel + "')").length) {
-                    $("#select2-chosen-1").removeClass("restricted");
-                    $("#field-visibility option[value='unrestricted']").attr("disabled", false);
-                    $("#field-visibility option[value='restricted']").attr("disabled", false);
-                    $("#field-visibility option[value='restricted']").attr("selected", false);
-                    $("#field-visibility option[value='unrestricted']").attr("selected", true);
+            $("#field-visibility").on("change", function(e) {
+                $("#field-parent").val("");
+                $("#select2-chosen-1").text($("#field-parent option[value='']").text());
+                if ($(this).val() == "restricted") {
+                    $("#field-parent option:not('.restricted')").addClass("hide");
+                    $("#field-parent option.restricted").removeClass("hide");
+                    $("#field-parent option[value='']").removeClass("hide");
                 } else {
-                    $("#select2-chosen-1").removeClass("restricted");
-                    $("#field-visibility option[value='restricted']").attr("disabled", true);
-                    $("#field-visibility option[value='unrestricted']").attr("disabled", false);
-                    $("#field-visibility option[value='restricted']").attr("selected", false);
-                    $("#field-visibility option[value='unrestricted']").attr("selected", true);
-                }
+                    $("#field-parent option.restricted").addClass("hide");
+                    $("#field-parent option:not('.restricted')").removeClass("hide");
+                };
             });
         }
-    }
+    };
 })

From fde9f1c8ad9075dfb9e63e274227e13ae7c3c628 Mon Sep 17 00:00:00 2001
From: alexmorev <aleksey.morev@linkdigital.com.au>
Date: Tue, 15 Oct 2024 19:32:52 +0300
Subject: [PATCH 22/26] SXDEDPCXZIC-380 / fix parent field ValidationError

---
 ckanext/datavicmain/organisation_schema.yaml |  1 +
 ckanext/datavicmain/tests/test_actions.py    | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ckanext/datavicmain/organisation_schema.yaml b/ckanext/datavicmain/organisation_schema.yaml
index c734fb40..d33769db 100644
--- a/ckanext/datavicmain/organisation_schema.yaml
+++ b/ckanext/datavicmain/organisation_schema.yaml
@@ -44,4 +44,5 @@ fields:
   - field_name: parent
     label: Parent
     form_snippet: org_hierarchy.html
+    validators: ignore_empty
     required: true
diff --git a/ckanext/datavicmain/tests/test_actions.py b/ckanext/datavicmain/tests/test_actions.py
index ef2e7a5c..90562cc2 100644
--- a/ckanext/datavicmain/tests/test_actions.py
+++ b/ckanext/datavicmain/tests/test_actions.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import pytest
-from unittest import mock
 
+import ckan.tests.factories as factories
 import ckan.tests.helpers as helpers
 
 from ckanext.datavicmain import const
@@ -65,3 +65,18 @@ def test_not_resticted_for_sysadmins(self, sysadmin, organization_factory):
         )
 
         assert results
+
+
+@pytest.mark.usefixtures("with_plugins", "clean_db")
+class TestOrganizationCreate(object):
+    def test_create_organization(self):
+        user = factories.User()
+        context = {"user": user["name"], "ignore_auth": True}
+
+        result = helpers.call_action(
+            "organization_create",
+            context=context,
+            name=factories.Organization.stub().name,
+        )
+        
+        assert result

From dca07e5b9089f8dbae6ba8d28dc7d2d5a3828643 Mon Sep 17 00:00:00 2001
From: Yan Rudenko <yan.rudenko@linkdigital.com.au>
Date: Mon, 21 Oct 2024 22:32:26 +0200
Subject: [PATCH 23/26] SXDEDPCXZIC-378 / Improve Org list page performance

---
 ckanext/datavicmain/logic/action.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ckanext/datavicmain/logic/action.py b/ckanext/datavicmain/logic/action.py
index e6bd9116..711b76ad 100644
--- a/ckanext/datavicmain/logic/action.py
+++ b/ckanext/datavicmain/logic/action.py
@@ -153,14 +153,19 @@ def organization_list(
     """Restrict organisations. Force all_fields and include_extras, because we
     need visibility field to be here.
     Throw out extra fields later if it's not all_fields initially"""
-    all_fields = data_dict.pop("all_fields", False)
+    all_fields = data_dict.get("all_fields", False)
 
-    data_dict.update({"all_fields": True, "include_extras": True})
+    if all_fields:
+        data_dict.update({"include_extras": True})
 
     context["_skip_restriction_check"] = True
 
     org_list: types.ActionResult.OrganizationList = next_(context, data_dict)
 
+    if not all_fields:
+        # Intead of all all_fields, lets get the ID from the Objet as it much faster
+        org_list = [{'id': model.Group.get(org).id , 'name': org} for org in org_list]
+
     filtered_orgs = _hide_restricted_orgs(context, org_list)
 
     if not all_fields:

From f40f94a82437c983071c030372e5650db61643bb Mon Sep 17 00:00:00 2001
From: Yan Rudenko <yan.rudenko@linkdigital.com.au>
Date: Mon, 21 Oct 2024 23:03:05 +0200
Subject: [PATCH 24/26] SXDEDPCXZIC-378 / Improve code logic

---
 ckanext/datavicmain/logic/action.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ckanext/datavicmain/logic/action.py b/ckanext/datavicmain/logic/action.py
index 711b76ad..3ad45fd3 100644
--- a/ckanext/datavicmain/logic/action.py
+++ b/ckanext/datavicmain/logic/action.py
@@ -163,8 +163,11 @@ def organization_list(
     org_list: types.ActionResult.OrganizationList = next_(context, data_dict)
 
     if not all_fields:
+        orgs = model.Session.query(model.Group)\
+            .filter(model.Group.name.in_(org_list))
+
         # Intead of all all_fields, lets get the ID from the Objet as it much faster
-        org_list = [{'id': model.Group.get(org).id , 'name': org} for org in org_list]
+        org_list = [{'id': org.id , 'name': org.name} for org in orgs]
 
     filtered_orgs = _hide_restricted_orgs(context, org_list)
 

From 1322ebe94332a134a8fbd061931b533a053568a5 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Mon, 2 Dec 2024 11:25:29 +0200
Subject: [PATCH 25/26] fix: fix organization_update is_org_changed logic

---
 ckanext/datavicmain/logic/action.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datavicmain/logic/action.py b/ckanext/datavicmain/logic/action.py
index 99396a48..99a0585a 100644
--- a/ckanext/datavicmain/logic/action.py
+++ b/ckanext/datavicmain/logic/action.py
@@ -113,10 +113,10 @@ def organization_update(next_, context, data_dict):
 
 
 def _is_org_changed(
-    old_org: dict[str, Any], new_org: dict[str, Any], tracked_fields: list[str]
+    old_org: model.Group, new_org: dict[str, Any], tracked_fields: list[str]
 ) -> bool:
     for field_name in tracked_fields:
-        if old_org.get(field_name) != new_org.get(field_name):
+        if old_org.__dict__.get(field_name) != new_org.get(field_name):
             return True
 
     return False

From 7265860fcb5c4ae3e421256147937ec5a5d5ae45 Mon Sep 17 00:00:00 2001
From: mutantsan <kvaqich@gmail.com>
Date: Fri, 6 Dec 2024 08:46:11 +0200
Subject: [PATCH 26/26] fix: fix resource edit/create page missing fields

---
 ckanext/datavicmain/templates/package/base.html                 | 2 +-
 .../datavicmain/templates/package/snippets/resource_form.html   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 ckanext/datavicmain/templates/package/snippets/resource_form.html

diff --git a/ckanext/datavicmain/templates/package/base.html b/ckanext/datavicmain/templates/package/base.html
index 89793d72..5477a8ff 100644
--- a/ckanext/datavicmain/templates/package/base.html
+++ b/ckanext/datavicmain/templates/package/base.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block breadcrumb_content %}
-    {#} check if user has an access to parent org before showing it in breadcrumb {#}
+    {# check if user has an access to parent org before showing it in breadcrumb #}
 
     {% if pkg %}
         {% set dataset = h.dataset_display_name(pkg) %}
diff --git a/ckanext/datavicmain/templates/package/snippets/resource_form.html b/ckanext/datavicmain/templates/package/snippets/resource_form.html
deleted file mode 100644
index e69de29b..00000000