Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

genericizes label viewer #161

Merged
merged 10 commits into from
Jan 2, 2025
Merged

genericizes label viewer #161

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b2737d
genericizes label viewer
aarongundel Dec 23, 2024
3f728bf
Merge branch 'adg/146-scheme-names' into adg/146-genericize-label-viewer
aarongundel Dec 24, 2024
832365b
rename label viewer to metastring viewer
aarongundel Dec 26, 2024
bc16aa5
Merge branch 'adg/146-scheme-names' into adg/146-genericize-label-viewer
aarongundel Dec 27, 2024
e61f26c
imports from constants, fix zoom
aarongundel Dec 31, 2024
694cac1
Merge branch 'adg/146-scheme-names' into adg/146-genericize-label-viewer
aarongundel Dec 31, 2024
0868230
adds notes section (#162)
aarongundel Jan 2, 2025
eb985a4
Merge branch 'adg/146-scheme-names' into adg/146-genericize-label-viewer
aarongundel Jan 2, 2025
82f4dcf
pr feedback
aarongundel Jan 2, 2025
d3e539f
pr feedback :ping_pong:
aarongundel Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions arches_lingo/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,22 @@ class Meta:
fields = "__all__"


class SchemeNoteSerializer(ArchesModelSerializer):
class Meta:
model = ResourceInstance
graph_slug = "scheme"
nodegroups = ["statement"]
fields = "__all__"


class SchemeNoteTileSerializer(ArchesTileSerializer):
class Meta:
model = TileModel
graph_slug = "scheme"
root_node = "statement"
fields = "__all__"


class TextualWorkRdmSystemSerializer(ArchesModelSerializer):
class Meta:
model = ResourceInstance
Expand Down
43 changes: 38 additions & 5 deletions arches_lingo/src/arches_lingo/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,44 @@ export const fetchSchemeLabel = async (schemeId: string) => {
return parsed;
};

export const deleteSchemeLabelTile = async (tileId: string) => {
const response = await fetch(arches.urls.api_scheme_label_tile(tileId), {
method: "DELETE",
headers: { "X-CSRFTOKEN": getToken() },
});
export const deleteSchemeLabelTile = async (
schemeId: string,
tileId: string,
) => {
const response = await fetch(
arches.urls.api_scheme_label_tile(schemeId, tileId),
{
method: "DELETE",
headers: { "X-CSRFTOKEN": getToken() },
},
);

if (!response.ok) {
const parsed = await response.json();
throw new Error(parsed.message || response.statusText);
} else {
return true;
}
};

export const fetchSchemeNotes = async (schemeId: string) => {
const response = await fetch(arches.urls.api_scheme_note(schemeId));
const parsed = await response.json();
if (!response.ok) throw new Error(parsed.message || response.statusText);
return parsed;
};

export const deleteSchemeNoteTile = async (
schemeId: string,
tileId: string,
) => {
const response = await fetch(
arches.urls.api_scheme_note_tile(schemeId, tileId),
{
method: "DELETE",
headers: { "X-CSRFTOKEN": getToken() },
},
);

if (!response.ok) {
const parsed = await response.json();
Expand Down
164 changes: 0 additions & 164 deletions arches_lingo/src/arches_lingo/components/generic/LabelViewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,164 +0,0 @@
<script setup lang="ts">
import { ref } from "vue";
import { useGettext } from "vue3-gettext";
import DataTable from "primevue/datatable";
import Column from "primevue/column";
import Button from "primevue/button";
import ConfirmDialog from "primevue/confirmdialog";
import { useConfirm } from "primevue/useconfirm";

import ControlledListItem from "@/arches_lingo/components/generic/ControlledListItem.vue";
import ResourceInstanceRelationships from "@/arches_lingo/components/generic/ResourceInstanceRelationships.vue";

import type { AppellativeStatus } from "@/arches_lingo/types";

const { $gettext } = useGettext();
const confirm = useConfirm();

const props = defineProps<{
value?: AppellativeStatus[];
}>();

const emits = defineEmits(["editLabel", "deleteLabel"]);

const expandedRows = ref([]);

function confirmDelete(tileId: string) {
confirm.require({
header: $gettext("Confirmation"),
message: $gettext("Are you sure you want to delete this label?"),
accept: () => {
emits("deleteLabel", tileId);
},
rejectProps: {
label: "Cancel",
severity: "secondary",
outlined: true,
},
acceptProps: {
label: "Delete",
severity: "danger",
},
});
}
</script>

<template>
<ConfirmDialog
:pt="{ root: { style: { fontFamily: 'sans-serif' } } }"
></ConfirmDialog>
<DataTable
v-model:expanded-rows="expandedRows"
:value="props.value"
table-style="min-width: 50rem"
>
<Column
expander
style="width: 3rem"
/>
<Column
field="appellative_status_ascribed_name_content"
:header="$gettext('Label')"
sortable
>
<template #body="slotProps">
{{
(slotProps.data as AppellativeStatus)
.appellative_status_ascribed_name_content
}}
</template>
</Column>
<Column
field="appellative_status_ascribed_relation"
:header="$gettext('Label Type')"
sortable
>
<template #body="slotProps">
<ControlledListItem
:value="
(slotProps.data as AppellativeStatus)
.appellative_status_ascribed_relation
"
>
</ControlledListItem>
</template>
</Column>
<Column
field="appellative_status_ascribed_name_language"
:header="$gettext('Label Language')"
sortable
>
<template #body="slotProps">
<ControlledListItem
:value="
(slotProps.data as AppellativeStatus)
.appellative_status_ascribed_name_language
"
>
</ControlledListItem>
</template>
</Column>
<Column>
<template #body="slotProps">
<div class="controls">
<Button
icon="pi pi-file-edit"
:aria-label="$gettext('edit')"
@click="
() =>
emits(
'editLabel',
(slotProps.data as AppellativeStatus)
.tileid,
)
"
/>
<Button
icon="pi pi-trash"
:aria-label="$gettext('delete')"
severity="danger"
outlined
@click="
() =>
confirmDelete(
(slotProps.data as AppellativeStatus)
.tileid,
)
"
/>
</div>
</template>
</Column>
<template #expansion="slotProps">
<div class="drawer">
<div>
{{ $gettext("Bibliographic Sources") }}:
<ResourceInstanceRelationships
:value="
(slotProps.data as AppellativeStatus)
.appellative_status_data_assignment_object_used
"
></ResourceInstanceRelationships>
</div>
<div>
{{ $gettext("Contributors") }}:
<ResourceInstanceRelationships
:value="
(slotProps.data as AppellativeStatus)
.appellative_status_data_assignment_actor
"
></ResourceInstanceRelationships>
</div>
</div>
</template>
</DataTable>
</template>
<style scoped>
.controls {
display: flex;
flex-direction: row;
}
.controls button {
margin: 0 0.5rem;
}
</style>
138 changes: 138 additions & 0 deletions arches_lingo/src/arches_lingo/components/generic/MetaStringViewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
<script setup lang="ts">
import { ref } from "vue";
import { useGettext } from "vue3-gettext";
import DataTable from "primevue/datatable";
import Column from "primevue/column";
import Button from "primevue/button";
import ConfirmDialog from "primevue/confirmdialog";
import { useConfirm } from "primevue/useconfirm";

import type { MetaString, MetaStringText } from "@/arches_lingo/types.ts";
import { SECONDARY } from "@/arches_lingo/constants.ts";
import { DANGER } from "@/arches_references/constants.ts";

const { $gettext } = useGettext();
const confirm = useConfirm();

const props = defineProps<{
metaStringText: MetaStringText;
metaStrings?: object[];
}>();

const emits = defineEmits(["editString", "deleteString"]);
const expandedRows = ref([]);
function confirmDelete(tileId: string) {
confirm.require({
header: $gettext("Confirmation"),
message: props.metaStringText.deleteConfirm,
group: props.metaStringText.name,
accept: () => {
emits("deleteString", tileId);
},
rejectProps: {
label: $gettext("Cancel"),
severity: SECONDARY,
outlined: true,
},
acceptProps: {
label: $gettext("Delete"),
severity: DANGER,
},
});
}
</script>

<template>
<ConfirmDialog
:pt="{ root: { style: { fontFamily: 'sans-serif' } } }"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen this repeated enough that I'm wondering if there's some base style setting we can tweak to obviate this

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps we could create a constant with this object value? I'm not sure there's a supported way to tweak the base style, though. cc @jacobtylerwalls

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recall the problem is that primevue appends DOM elements for modals and tooltips outside the <main> element.

:group="metaStringText.name"
></ConfirmDialog>
<DataTable
v-model:expanded-rows="expandedRows"
:value="props.metaStrings"
>
<Column
expander
style="width: 3rem"
/>
<Column
:header="props.metaStringText.name"
sortable
>
<template #body="slotProps">
<slot
name="name"
:row-data="slotProps.data"
></slot>
</template>
</Column>
<Column
:header="props.metaStringText.type"
sortable
>
<template #body="slotProps">
<slot
name="type"
:row-data="slotProps.data"
></slot>
</template>
</Column>
<Column
:header="props.metaStringText.language"
sortable
>
<template #body="slotProps">
<slot
name="language"
:row-data="slotProps.data"
></slot>
</template>
</Column>
<Column>
<template #body="slotProps">
<div class="controls">
<Button
icon="pi pi-file-edit"
:aria-label="$gettext('edit')"
@click="
() =>
emits(
'editString',
(slotProps.data as MetaString).tileid,
)
"
/>
<Button
icon="pi pi-trash"
:aria-label="$gettext('delete')"
severity="danger"
outlined
@click="
() =>
confirmDelete(
(slotProps.data as MetaString).tileid,
)
"
/>
</div>
</template>
</Column>
<template #expansion="slotProps">
<div class="drawer">
<slot
name="drawer"
:row-data="slotProps.data"
></slot>
</div>
</template>
</DataTable>
</template>
<style scoped>
.controls {
display: flex;
flex-direction: row;
}
.controls button {
margin: 0 0.5rem;
}
</style>
2 changes: 1 addition & 1 deletion arches_lingo/src/arches_lingo/components/generic/ResourceInstanceRelationships.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import ResourceInstanceRelationshipsViewer from "@/arches_lingo/components/generic//resource-instance-relationships/ResourceInstanceRelationshipsViewer.vue";
import ResourceInstanceRelationshipsViewer from "@/arches_lingo/components/generic/resource-instance-relationships/ResourceInstanceRelationshipsViewer.vue";
import ResourceInstanceRelationshipsEditor from "@/arches_lingo/components/generic/resource-instance-relationships/ResourceInstanceRelationshipsEditor.vue";
import { EDIT, VIEW } from "@/arches_lingo/constants.ts";
import type {
Expand Down
Loading
Loading