pr feedback #147

archesproject · Jan 17, 2025 · e446b17 · e446b17
1 parent 470616f
commit e446b17
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 deletions.
diff --git a/arches_lingo/src/arches_lingo/api.ts b/arches_lingo/src/arches_lingo/api.ts
@@ -84,7 +84,7 @@ export const createSchemeLabel = async (
     schemeId: string,
     appellative_status: AppellativeStatus,
 ) => {
-    const response = await fetch(arches.urls.api_scheme_label_create, {
+    const response = await fetch(arches.urls.api_scheme_label_list_create, {
         method: "POST",
         headers: {
             "X-CSRFTOKEN": getToken(),

diff --git a/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue b/arches_lingo/src/arches_lingo/components/generic/LabelEditor.vue
@@ -131,7 +131,20 @@ async function save() {
 async function getControlledListOptions(
     listId: string,
 ): Promise<ControlledListItem[]> {
-    const parsed = await fetchControlledListOptions(listId);
+    let parsed;
+    try {
+        parsed = await fetchControlledListOptions(listId);
+    } catch (error) {
+        toast.add({
+            severity: ERROR,
+            summary: $gettext("Error"),
+            detail:
+                error instanceof Error
+                    ? error.message
+                    : $gettext("Could not fetch the controlled list options"),
+        });
+        return [];
+    }
     const options = parsed.items.map(
         (item: ControlledListItemResult): ControlledListItem => ({
             list_id: item.list_id,
@@ -145,7 +158,20 @@ async function getControlledListOptions(
 async function getResourceInstanceOptions(
     fetchOptions: () => Promise<ResourceInstanceResult[]>,
 ): Promise<ResourceInstanceReference[]> {
-    const options = await fetchOptions();
+    let options;
+    try {
+        options = await fetchOptions();
+    } catch (error) {
+        toast.add({
+            severity: ERROR,
+            summary: $gettext("Error"),
+            detail:
+                error instanceof Error
+                    ? error.message
+                    : $gettext("Could not fetch the resource instance options"),
+        });
+        return [];
+    }
     const results = options.map((option: ResourceInstanceResult) => {
         const result: ResourceInstanceReference = {
             display_value: option.descriptors[selectedLanguage.value.code].name,

diff --git a/..._lingo/src/arches_lingo/components/generic/reference-datatype/ReferenceDatatypeEditor.vue b/..._lingo/src/arches_lingo/components/generic/reference-datatype/ReferenceDatatypeEditor.vue
@@ -71,7 +71,7 @@ function getOptionLabels(item: ControlledListItem): string {
     <Select
         v-model="val"
         v-if:="!props.multiValue"
-        :show-toggle-all="options?.length"
+        :show-toggle-all="!!options?.length"
         :options
         :option-label="getOptionLabels"
         option-value="uri"
@@ -84,7 +84,7 @@ function getOptionLabels(item: ControlledListItem): string {
     <MultiSelect
         v-if="props.multiValue"
         v-model="val"
-        :show-toggle-all="options?.length"
+        :show-toggle-all="!!options?.length"
         :options
         :option-label="getOptionLabels"
         option-value="uri"

diff --git a/arches_lingo/src/arches_lingo/types.ts b/arches_lingo/src/arches_lingo/types.ts
@@ -36,7 +36,7 @@ export interface Scheme {
     top_concepts: Concept[];
 }
 
-export interface ControlledListeItemLabelValue {
+export interface ControlledListItemLabelValue {
     id: string;
     valuetype_id: string;
     language_id: string;
@@ -50,7 +50,7 @@ export interface ControlledListItem {
     uri: string;
     sortorder?: number;
     guide?: boolean;
-    labels: ControlledListeItemLabelValue[];
+    labels: ControlledListItemLabelValue[];
 }
 
 export interface ControlledListItemResult {
@@ -59,7 +59,7 @@ export interface ControlledListItemResult {
     uri: string;
     sortorder?: number;
     guide?: boolean;
-    values: ControlledListeItemLabelValue[];
+    values: ControlledListItemLabelValue[];
 }
 
 export interface ResourceInstanceReference {

diff --git a/arches_lingo/templates/arches_urls.htm b/arches_lingo/templates/arches_urls.htm
@@ -13,7 +13,7 @@
     api_schemes="{% url 'schemes-list-create' %}"
     api_scheme_label='(resourceid)=>{return "{% url "api-scheme-label" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" %}".replace("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", resourceid)}'
     api_scheme_label_tile='(resourceid, tileid)=>{return "{% url "api-scheme-label-tile" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab"%}".replace("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", resourceid).replace("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab", tileid)}'
-    api_scheme_label_create="{% url 'api-scheme-label-create' %}"
+    api_scheme_label_list_create="{% url 'api-scheme-label-list-create' %}"
     api_scheme_note='(resourceid)=>{return "{% url "api-scheme-note" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" %}".replace("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", resourceid)}'
     api_scheme_note_tile='(resourceid, tileid)=>{return "{% url "api-scheme-note-tile" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab" %}".replace("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", resourceid).replace("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaab", tileid)}'
     api_scheme_creation='(resourceid)=>{return "{% url "api-scheme-creation" "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" %}".replace("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", resourceid)}'

diff --git a/arches_lingo/urls.py b/arches_lingo/urls.py
@@ -72,9 +72,9 @@
         name="api-scheme-label-tile",
     ),
     path(
-        "api/scheme/label",
+        "api/scheme/labels",
         SchemeLabelCreateView.as_view(),
-        name="api-scheme-label-create",
+        name="api-scheme-label-list-create",
     ),
     path(
         "api/scheme/<uuid:pk>/note",