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

Combine create api, #244 #256

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Combine create api, #244 #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f39140
Combine create Scheme & Concept apis, #244
njkim Mar 7, 2025
782bb49
Update api calls, #244
njkim Mar 7, 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
23 changes: 6 additions & 17 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 @@ -150,28 +150,17 @@ export const deleteLingoTile = async (
}
};

export const createScheme = async (newScheme: SchemeInstance) => {
const response = await fetch(arches.urls.api_lingo_resources("scheme"), {
method: "POST",
headers: {
"X-CSRFTOKEN": getToken(),
"Content-Type": "application/json",
},
body: JSON.stringify(newScheme),
});
const parsed = await response.json();
if (!response.ok) throw new Error(parsed.message || response.statusText);
return parsed;
};

export const createConcept = async (newConcept: ConceptInstance) => {
const response = await fetch(arches.urls.api_lingo_resources("concept"), {
export const createLingoResource = async (
newResource: SchemeInstance | ConceptInstance,
graphSlug: string,
) => {
const response = await fetch(arches.urls.api_lingo_resources(graphSlug), {
method: "POST",
headers: {
"X-CSRFTOKEN": getToken(),
"Content-Type": "application/json",
},
body: JSON.stringify(newConcept),
body: JSON.stringify(newResource),
});
const parsed = await response.json();
if (!response.ok) throw new Error(parsed.message || response.statusText);
Expand Down
19 changes: 11 additions & 8 deletions ..._lingo/src/arches_lingo/components/concept/ConceptLabel/components/ConceptLabelEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import NonLocalizedStringWidget from "@/arches_component_lab/widgets/NonLocalize
import ReferenceSelectWidget from "@/arches_controlled_lists/widgets/ReferenceSelectWidget/ReferenceSelectWidget.vue";
import ResourceInstanceMultiSelectWidget from "@/arches_component_lab/widgets/ResourceInstanceMultiSelectWidget/ResourceInstanceMultiSelectWidget.vue";

import { createConcept, upsertLingoTile } from "@/arches_lingo/api.ts";
import { createLingoResource, upsertLingoTile } from "@/arches_lingo/api.ts";
import { EDIT } from "@/arches_lingo/constants.ts";

import type { Component, Ref } from "vue";
Expand Down Expand Up @@ -54,18 +54,21 @@ async function save(e: FormSubmitEvent) {
let updatedTileId;

if (!props.resourceInstanceId) {
const updatedScheme = await createConcept({
[props.nodegroupAlias]: [formData],
});
const updatedConcept = await createLingoResource(
{
[props.nodegroupAlias]: [formData],
},
props.graphSlug,
);

await router.push({
name: props.graphSlug,
params: { id: updatedScheme.resourceinstanceid },
params: { id: updatedConcept.resourceinstanceid },
});

updatedTileId = updatedScheme[props.nodegroupAlias][0].tileid;
updatedTileId = updatedConcept[props.nodegroupAlias][0].tileid;
} else {
const updatedScheme = await upsertLingoTile(
const updatedConcept = await upsertLingoTile(
props.graphSlug,
props.nodegroupAlias,
{
Expand All @@ -75,7 +78,7 @@ async function save(e: FormSubmitEvent) {
},
);

updatedTileId = updatedScheme.tileid;
updatedTileId = updatedConcept.tileid;
}

openEditor!(props.componentName, updatedTileId);
Expand Down
11 changes: 7 additions & 4 deletions ...es_lingo/src/arches_lingo/components/concept/ConceptNote/components/ConceptNoteEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import NonLocalizedStringWidget from "@/arches_component_lab/widgets/NonLocalize
import ReferenceSelectWidget from "@/arches_controlled_lists/widgets/ReferenceSelectWidget/ReferenceSelectWidget.vue";
import ResourceInstanceMultiSelectWidget from "@/arches_component_lab/widgets/ResourceInstanceMultiSelectWidget/ResourceInstanceMultiSelectWidget.vue";

import { createConcept, upsertLingoTile } from "@/arches_lingo/api.ts";
import { createLingoResource, upsertLingoTile } from "@/arches_lingo/api.ts";
import { EDIT } from "@/arches_lingo/constants.ts";

import type { Component, Ref } from "vue";
Expand Down Expand Up @@ -54,9 +54,12 @@ async function save(e: FormSubmitEvent) {
let updatedTileId;

if (!props.resourceInstanceId) {
const updatedConcept = await createConcept({
[props.nodegroupAlias]: [formData],
});
const updatedConcept = await createLingoResource(
{
[props.nodegroupAlias]: [formData],
},
props.graphSlug,
);

await router.push({
name: props.graphSlug,
Expand Down
11 changes: 7 additions & 4 deletions arches_lingo/src/arches_lingo/components/scheme/SchemeLabel/components/SchemeLabelEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import NonLocalizedStringWidget from "@/arches_component_lab/widgets/NonLocalize
import ReferenceSelectWidget from "@/arches_controlled_lists/widgets/ReferenceSelectWidget/ReferenceSelectWidget.vue";
import ResourceInstanceMultiSelectWidget from "@/arches_component_lab/widgets/ResourceInstanceMultiSelectWidget/ResourceInstanceMultiSelectWidget.vue";

import { createScheme, upsertLingoTile } from "@/arches_lingo/api.ts";
import { createLingoResource, upsertLingoTile } from "@/arches_lingo/api.ts";
import { EDIT } from "@/arches_lingo/constants.ts";

import type { Component, Ref } from "vue";
Expand Down Expand Up @@ -54,9 +54,12 @@ async function save(e: FormSubmitEvent) {
let updatedTileId;

if (!props.resourceInstanceId) {
const updatedScheme = await createScheme({
[props.nodegroupAlias]: [formData],
});
const updatedScheme = await createLingoResource(
{
[props.nodegroupAlias]: [formData],
},
props.graphSlug,
);

await router.push({
name: props.graphSlug,
Expand Down
11 changes: 7 additions & 4 deletions ...lingo/src/arches_lingo/components/scheme/SchemeLicense/components/SchemeLicenseEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import NonLocalizedStringWidget from "@/arches_component_lab/widgets/NonLocalize
import ReferenceSelectWidget from "@/arches_controlled_lists/widgets/ReferenceSelectWidget/ReferenceSelectWidget.vue";
import ResourceInstanceMultiSelectWidget from "@/arches_component_lab/widgets/ResourceInstanceMultiSelectWidget/ResourceInstanceMultiSelectWidget.vue";

import { createScheme, upsertLingoTile } from "@/arches_lingo/api.ts";
import { createLingoResource, upsertLingoTile } from "@/arches_lingo/api.ts";

import { EDIT } from "@/arches_lingo/constants.ts";

Expand Down Expand Up @@ -67,9 +67,12 @@ async function save(e: FormSubmitEvent) {
let updatedTileId;

if (!props.resourceInstanceId) {
const updatedScheme = await createScheme({
[props.nodegroupAlias]: expectedTileShape,
});
const updatedScheme = await createLingoResource(
{
[props.nodegroupAlias]: [formData],
},
props.graphSlug,
);

await router.push({
name: props.graphSlug,
Expand Down
11 changes: 7 additions & 4 deletions ...o/src/arches_lingo/components/scheme/SchemeNamespace/components/SchemeNamespaceEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Form } from "@primevue/forms";

import NonLocalizedStringWidget from "@/arches_component_lab/widgets/NonLocalizedStringWidget/NonLocalizedStringWidget.vue";

import { createScheme, upsertLingoTile } from "@/arches_lingo/api.ts";
import { createLingoResource, upsertLingoTile } from "@/arches_lingo/api.ts";
import { EDIT } from "@/arches_lingo/constants.ts";

import type { FormSubmitEvent } from "@primevue/forms";
Expand Down Expand Up @@ -50,9 +50,12 @@ async function save(e: FormSubmitEvent) {
let updatedTileId;

if (!props.resourceInstanceId) {
const updatedScheme = await createScheme({
[props.nodegroupAlias]: formData,
});
const updatedScheme = await createLingoResource(
{
[props.nodegroupAlias]: [formData],
},
props.graphSlug,
);

await router.push({
name: props.graphSlug,
Expand Down
11 changes: 7 additions & 4 deletions arches_lingo/src/arches_lingo/components/scheme/SchemeNote/components/SchemeNoteEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import NonLocalizedStringWidget from "@/arches_component_lab/widgets/NonLocalize
import ReferenceSelectWidget from "@/arches_controlled_lists/widgets/ReferenceSelectWidget/ReferenceSelectWidget.vue";
import ResourceInstanceMultiSelectWidget from "@/arches_component_lab/widgets/ResourceInstanceMultiSelectWidget/ResourceInstanceMultiSelectWidget.vue";

import { createScheme, upsertLingoTile } from "@/arches_lingo/api.ts";
import { createLingoResource, upsertLingoTile } from "@/arches_lingo/api.ts";
import { EDIT } from "@/arches_lingo/constants.ts";

import type { Component, Ref } from "vue";
Expand Down Expand Up @@ -54,9 +54,12 @@ async function save(e: FormSubmitEvent) {
let updatedTileId;

if (!props.resourceInstanceId) {
const updatedScheme = await createScheme({
[props.nodegroupAlias]: [formData],
});
const updatedScheme = await createLingoResource(
{
[props.nodegroupAlias]: [formData],
},
props.graphSlug,
);

await router.push({
name: props.graphSlug,
Expand Down
11 changes: 7 additions & 4 deletions ...ngo/src/arches_lingo/components/scheme/SchemeStandard/components/SchemeStandardEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Form } from "@primevue/forms";

import ResourceInstanceMultiSelectWidget from "@/arches_component_lab/widgets/ResourceInstanceMultiSelectWidget/ResourceInstanceMultiSelectWidget.vue";

import { createScheme, upsertLingoTile } from "@/arches_lingo/api.ts";
import { createLingoResource, upsertLingoTile } from "@/arches_lingo/api.ts";
import { EDIT } from "@/arches_lingo/constants.ts";

import type { FormSubmitEvent } from "@primevue/forms";
Expand Down Expand Up @@ -49,9 +49,12 @@ async function save(e: FormSubmitEvent) {
let updatedTileId;

if (!props.resourceInstanceId) {
const updatedScheme = await createScheme({
[props.nodegroupAlias]: formData,
});
const updatedScheme = await createLingoResource(
{
[props.nodegroupAlias]: [formData],
},
props.graphSlug,
);

await router.push({
name: props.graphSlug,
Expand Down
Loading