[Fixes #13261] Removing legacy code from Layers app (#13277)

* removing dataset_granule_remove related code
* removing unused importing libraries from views
* removing unused functions from utils
* removing unused utils from layers

Author: Gpetrak

geonode/layers/templates/datasets/dataset_granule_remove.html

@@ -63,11 +63,8 @@
 from geonode.groups.models import GroupProfile
 
 from geonode.layers.utils import (
-    dataset_type,
     get_files,
     get_valid_name,
-    get_valid_dataset_name,
-    surrogate_escape_string,
 )
 
 from geonode.base.populate_test_data import all_public, create_models, remove_models, create_single_dataset
@@ -341,29 +338,6 @@ def test_get_valid_user(self):
         nn = get_anonymous_user()
         self.assertRaises(GeoNodeException, get_valid_user, nn)
 
-    def test_dataset_type(self):
-        self.assertEqual(dataset_type("foo.shp"), "vector")
-        self.assertEqual(dataset_type("foo.SHP"), "vector")
-        self.assertEqual(dataset_type("foo.sHp"), "vector")
-        self.assertEqual(dataset_type("foo.tif"), "raster")
-        self.assertEqual(dataset_type("foo.TIF"), "raster")
-        self.assertEqual(dataset_type("foo.TiF"), "raster")
-        self.assertEqual(dataset_type("foo.geotif"), "raster")
-        self.assertEqual(dataset_type("foo.GEOTIF"), "raster")
-        self.assertEqual(dataset_type("foo.gEoTiF"), "raster")
-        self.assertEqual(dataset_type("foo.tiff"), "raster")
-        self.assertEqual(dataset_type("foo.TIFF"), "raster")
-        self.assertEqual(dataset_type("foo.TiFf"), "raster")
-        self.assertEqual(dataset_type("foo.geotiff"), "raster")
-        self.assertEqual(dataset_type("foo.GEOTIFF"), "raster")
-        self.assertEqual(dataset_type("foo.gEoTiFf"), "raster")
-        self.assertEqual(dataset_type("foo.asc"), "raster")
-        self.assertEqual(dataset_type("foo.ASC"), "raster")
-        self.assertEqual(dataset_type("foo.AsC"), "raster")
-
-        # basically anything else should produce a GeoNodeException
-        self.assertRaises(GeoNodeException, lambda: dataset_type("foo.gml"))
-
     def test_get_files(self):
         def generate_files(*extensions):
             if extensions[0].lower() != "shp":
@@ -499,28 +473,6 @@ def test_get_valid_name(self):
         self.assertNotEqual(get_valid_name("CA"), "CA_1")
         self.assertNotEqual(get_valid_name("CA"), "CA_1")
 
-    def test_get_valid_dataset_name(self):
-        self.assertEqual(get_valid_dataset_name("blug", False), "blug")
-        self.assertEqual(get_valid_dataset_name("blug", True), "blug")
-
-        self.assertEqual(get_valid_dataset_name("<ab>", False), "_ab_")
-        self.assertEqual(get_valid_dataset_name("<ab>", True), "<ab>")
-
-        self.assertEqual(get_valid_dataset_name("<-->", False), "_")
-        self.assertEqual(get_valid_dataset_name("<-->", True), "<-->")
-
-        self.assertNotEqual(get_valid_dataset_name("CA", False), "CA_1")
-        self.assertNotEqual(get_valid_dataset_name("CA", False), "CA_1")
-        self.assertEqual(get_valid_dataset_name("CA", True), "CA")
-        self.assertEqual(get_valid_dataset_name("CA", True), "CA")
-
-        layer = Dataset.objects.get(name="CA")
-        self.assertNotEqual(get_valid_dataset_name(layer, False), "CA_1")
-        self.assertEqual(get_valid_dataset_name(layer, True), "CA")
-
-        self.assertRaises(GeoNodeException, get_valid_dataset_name, 12, False)
-        self.assertRaises(GeoNodeException, get_valid_dataset_name, 12, True)
-
     # NOTE: we don't care about file content for many of these tests (the
     # forms under test validate based only on file name, and leave actual
     # content inspection to GeoServer) but Django's form validation will omit
@@ -573,19 +525,6 @@ def test_assign_change_dataset_data_perm(self):
         self.assertNotIn(user, perms["users"])
         self.assertNotIn(user.username, perms["users"])
 
-    def test_surrogate_escape_string(self):
-        surrogate_escape_raw = "Zo\udcc3\udcab"
-        surrogate_escape_expected = "Zoë"
-        surrogate_escape_result = surrogate_escape_string(
-            surrogate_escape_raw, "UTF-8"
-        )  # add more test cases using different charsets?
-        self.assertEqual(
-            surrogate_escape_result,
-            surrogate_escape_expected,
-            "layers.utils.surrogate_escape_string did not produce expected result. "
-            f"Expected {surrogate_escape_expected}, received {surrogate_escape_result}",
-        )
-
     @on_ogc_backend(geoserver.BACKEND_PACKAGE)
     def test_assign_remove_permissions(self):
         # Assing

geonode/layers/tests.py

@@ -29,13 +29,6 @@
 
 urlpatterns = [
     # 'geonode.layers.views',
-    re_path(r"^load_dataset_data$", views.load_dataset_data, name="load_dataset_data"),
-    re_path(
-        r"^(?P<granule_id>[^/]*)/(?P<layername>[^/]*)/granule_remove$",
-        views.dataset_granule_remove,
-        name="dataset_granule_remove",
-    ),
-    re_path(r"^(?P<layername>[^/]*)/get$", views.get_dataset, name="get_dataset"),
     re_path(r"^(?P<layername>[^/]+)/embed$", views.dataset_embed, name="dataset_embed"),
     re_path(
         r"^(?P<layername>[^/]*)/feature_catalogue$", views.dataset_feature_catalogue, name="dataset_feature_catalogue"

geonode/layers/urls.py

@@ -27,9 +27,8 @@
 import glob
 import string
 import logging
-import tarfile
 
-from zipfile import ZipFile, is_zipfile
+from zipfile import is_zipfile
 from random import choice
 
 # Django functionality
@@ -47,7 +46,7 @@
 from geonode.base.models import Region
 from geonode.utils import check_ogc_backend
 from geonode import GeoNodeException, geoserver
-from geonode.layers.models import shp_exts, csv_exts, vec_exts, cov_exts, Dataset
+from geonode.layers.models import cov_exts, Dataset
 from geonode.security.registry import permissions_registry
 
 READ_PERMISSIONS = ["view_resourcebase"]
@@ -203,40 +202,6 @@ def get_files(filename):
     return files, tempdir
 
 
-def dataset_type(filename):
-    """Finds out if a filename is a Feature or a Vector
-    returns a gsconfig resource_type string
-    that can be either 'featureType' or 'coverage'
-    """
-    base_name, extension = os.path.splitext(filename)
-
-    if extension.lower() == ".zip":
-        zf = ZipFile(filename, allowZip64=True)
-        # ZipFile doesn't support with statement in 2.6, so don't do it
-        with zf:
-            for n in zf.namelist():
-                b, e = os.path.splitext(n.lower())
-                if e in shp_exts or e in cov_exts or e in csv_exts:
-                    extension = e
-
-    if extension.lower() == ".tar" or filename.endswith(".tar.gz"):
-        tf = tarfile.open(filename)
-        # TarFile doesn't support with statement in 2.6, so don't do it
-        with tf:
-            for n in tf.getnames():
-                b, e = os.path.splitext(n.lower())
-                if e in shp_exts or e in cov_exts or e in csv_exts:
-                    extension = e
-
-    if extension.lower() in vec_exts:
-        return "vector"
-    elif extension.lower() in cov_exts:
-        return "raster"
-    else:
-        msg = f"Saving of extension [{extension}] is not implemented"
-        raise GeoNodeException(msg)
-
-
 def get_valid_name(dataset_name):
     """
     Create a brand new name
@@ -252,55 +217,6 @@ def get_valid_name(dataset_name):
     return proposed_name
 
 
-def get_valid_dataset_name(layer, overwrite):
-    """Checks if the layer is a string and fetches it from the database."""
-    # The first thing we do is get the layer name string
-    if isinstance(layer, Dataset):
-        dataset_name = layer.name
-    elif isinstance(layer, str):
-        dataset_name = str(layer)
-    else:
-        msg = "You must pass either a filename or a GeoNode dataset object"
-        raise GeoNodeException(msg)
-
-    if overwrite:
-        return dataset_name
-    else:
-        return get_valid_name(dataset_name)
-
-
-def get_default_user():
-    """Create a default user"""
-    superusers = get_user_model().objects.filter(is_superuser=True).order_by("id")
-    if superusers.exists():
-        # Return the first created superuser
-        return superusers[0]
-    else:
-        raise GeoNodeException(
-            "You must have an admin account configured "
-            "before importing data. "
-            "Try: django-admin.py createsuperuser"
-        )
-
-
-def is_vector(filename):
-    __, extension = os.path.splitext(filename)
-
-    if extension in vec_exts:
-        return True
-    else:
-        return False
-
-
-def is_raster(filename):
-    __, extension = os.path.splitext(filename)
-
-    if extension in cov_exts:
-        return True
-    else:
-        return False
-
-
 def delete_orphaned_datasets():
     """Delete orphaned layer files."""
     deleted = []
@@ -318,15 +234,6 @@ def delete_orphaned_datasets():
     return deleted
 
 
-def surrogate_escape_string(input_string, source_character_set):
-    """
-    Escapes a given input string using the provided source character set,
-    using the `surrogateescape` codec error handler.
-    """
-
-    return input_string.encode(source_character_set, "surrogateescape").decode("utf-8", "surrogateescape")
-
-
 def set_datasets_permissions(
     permissions_name, resources_names=None, users_usernames=None, groups_names=None, delete_flag=False, verbose=False
 ):