Update list importer exporter & tests

arches_references/management/commands/packages.py

@@ -45,15 +45,15 @@ def import_controlled_lists(self, source):
             wb = openpyxl.load_workbook(source)
             with transaction.atomic():
                 for sheet in wb.sheetnames:
-                    if sheet == "ControlledList":
+                    if sheet == "List":
                         created_instances_pks.extend(
                             self.import_sheet_to_model(wb[sheet], List)
                         )
-                    elif sheet == "ControlledListItem":
+                    elif sheet == "ListItem":
                         created_instances_pks.extend(
                             self.import_sheet_to_model(wb[sheet], ListItem)
                         )
-                    elif sheet == "ControlledListItemValue":
+                    elif sheet == "ListItemValue":
                         created_instances_pks.extend(
                             self.import_sheet_to_model(wb[sheet], ListItemValue)
                         )
@@ -146,7 +146,7 @@ def import_sheet_to_model(self, sheet, model):
     def export_controlled_lists(self, data_dest, file_name):
         wb = openpyxl.Workbook()
         ws = wb.active
-        ws.title = "ControlledList"
+        ws.title = "List"
         self.export_model_to_sheet(ws, List)
         self.export_model_to_sheet(wb, ListItem)
         self.export_model_to_sheet(wb, ListItemValue)
@@ -155,14 +155,14 @@ def export_controlled_lists(self, data_dest, file_name):
         #     data_dest = os.path.dirname(settings.SYSTEM_SETTINGS_LOCAL_PATH)
         if data_dest != "" and data_dest != ".":
             wb.save(os.path.join(data_dest, file_name))
-            self.stdout.write("Data exported successfully to controlled_lists.xlsx")
+            self.stdout.write(f"Data exported successfully to {file_name}")
         else:
             self.stdout.write(
                 "No destination directory specified. Please rerun this command with the '-d' parameter populated."
             )
 
     def export_model_to_sheet(self, wb, model):
-        # For the first sheet (ControlledList), use blank sheet that is initiallized with workbook
+        # For the first sheet (List), use blank sheet that is initiallized with workbook
         # otherwise, append a new sheet
         if isinstance(wb, openpyxl.worksheet.worksheet.Worksheet):
             ws = wb

arches_references/settings.py

@@ -140,6 +140,7 @@
     "corsheaders",
     "oauth2_provider",
     "django_celery_results",
+    "arches_vue_utils",
     # "silk",
 )
 

arches_references/src/arches_references/components/ControlledListsMain.vue

@@ -17,7 +17,7 @@ import ListHeader from "@/arches_references/components/misc/ListHeader.vue";
 import MainSplitter from "@/arches_references/components/MainSplitter.vue";
 
 import type { Ref } from "vue";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type { Selectable } from "@/arches_references/types";
 
 const router = useRouter();

arches_references/src/arches_references/components/editor/AddValue.vue

@@ -16,7 +16,7 @@ import {
 import { dataIsNew, shouldUseContrast } from "@/arches_references/utils.ts";
 
 import type { Ref } from "vue";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledListItem,
     Value,

arches_references/src/arches_references/components/editor/ItemHeader.vue

@@ -7,7 +7,7 @@ import { bestLabel } from "@/arches_references/utils.ts";
 import LetterCircle from "@/arches_references/components/misc/LetterCircle.vue";
 
 import type { Ref } from "vue";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type { ControlledListItem } from "@/arches_references/types";
 
 const selectedLanguage = inject(selectedLanguageKey) as Ref<Language>;

arches_references/src/arches_references/components/misc/ListHeader.vue

@@ -9,7 +9,7 @@ import {
 import { bestLabel, dataIsList } from "@/arches_references/utils.ts";
 
 import type { Ref } from "vue";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledList,
     ControlledListItem,

arches_references/src/arches_references/components/tree/ActionBanner.vue

@@ -14,7 +14,7 @@ import { bestLabel, shouldUseContrast } from "@/arches_references/utils.ts";
 import type { Ref } from "vue";
 import type { TreeSelectionKeys } from "primevue/tree";
 import type { TreeNode } from "primevue/treenode";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 
 const isMultiSelecting = defineModel<boolean>("isMultiSelecting", {
     required: true,

arches_references/src/arches_references/components/tree/AddDeleteControls.vue

@@ -31,7 +31,7 @@ import {
 import type { Ref } from "vue";
 import type { TreeSelectionKeys } from "primevue/tree";
 import type { TreeNode } from "primevue/treenode";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledList,
     ControlledListItem,

arches_references/src/arches_references/components/tree/ListTree.vue

@@ -24,7 +24,7 @@ import type { RouteLocationNormalizedLoadedGeneric } from "vue-router";
 import type { TreePassThroughMethodOptions } from "primevue/tree";
 import type { TreeExpandedKeys, TreeSelectionKeys } from "primevue/tree";
 import type { TreeNode } from "primevue/treenode";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledList,
     ControlledListItem,

arches_references/src/arches_references/components/tree/MoveRow.vue

@@ -29,7 +29,7 @@ import {
 import type { Ref } from "vue";
 import type { TreeExpandedKeys, TreeSelectionKeys } from "primevue/tree";
 import type { TreeNode } from "primevue/treenode";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledList,
     ControlledListItem,

arches_references/src/arches_references/components/tree/PresentationControls.vue

@@ -14,7 +14,7 @@ import {
 import { shouldUseContrast } from "@/arches_references/utils.ts";
 
 import type { Ref } from "vue";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 
 const { $gettext } = useGettext();
 

arches_references/src/arches_references/components/tree/TreeRow.vue

@@ -36,7 +36,7 @@ import MoveRow from "@/arches_references/components/tree/MoveRow.vue";
 import type { Ref } from "vue";
 import type { TreeExpandedKeys, TreeSelectionKeys } from "primevue/tree";
 import type { TreeNode } from "primevue/treenode";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledList,
     ControlledListItem,

arches_references/src/arches_references/constants.ts

@@ -1,5 +1,5 @@
 import type { InjectionKey, Ref } from "vue";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledList,
     ControlledListItem,

arches_references/src/arches_references/utils.ts

@@ -1,7 +1,7 @@
 import arches from "arches";
 
 import type { TreeNode } from "primevue/treenode";
-import type { Language } from "@/arches/types";
+import type { Language } from "@/arches_vue_utils/types";
 import type {
     ControlledList,
     ControlledListItem,

pyproject.toml

@@ -24,6 +24,7 @@ classifiers = [
 requires-python = ">=3.10"
 dependencies = [
     "arches @ git+https://github.com/archesproject/arches.git@dev/8.0.x",
+    "arches-vue-utils @ git+https://github.com/archesproject/arches-vue-utils.git@main",
 ]
 version = "0.0.1"
 

tests/cli_tests.py

@@ -59,8 +59,10 @@ def test_import_controlled_list(self):
                 source=input_file,
                 stdout=output,
             )
-        list_pk = "e962bdaf-8243-4fbb-bd43-39bc1f54c168"
-        self.assertTrue(List.objects.filter(pk=list_pk).exists())
+
+        self.assertEqual(List.objects.all().count(), 2)
+        self.assertEqual(ListItem.objects.all().count(), 10)
+        self.assertEqual(ListItemValue.objects.all().count(), 21)
 
     ### TODO Add test for creating new language if language code not in db but found in import file