diff --git a/frontend/src/api/cubicweb.ts b/frontend/src/api/cubicweb.ts index 18878c69f5f0dd0c2378d6eeb394581216b1a393_ZnJvbnRlbmQvc3JjL2FwaS9jdWJpY3dlYi50cw==..2b379c9ba75cad62b2723a59d2db3a11999d971c_ZnJvbnRlbmQvc3JjL2FwaS9jdWJpY3dlYi50cw== 100644 --- a/frontend/src/api/cubicweb.ts +++ b/frontend/src/api/cubicweb.ts @@ -92,9 +92,9 @@ export function useApiCreateProject() { const client = useClient(); const rql = - "INSERT ImportProcedure X: X name %(name)s, X sparql_endpoint %(sparql_endpoint)s, X activated %(activated)s"; + "INSERT ImportProcedure X: X name %(name)s, X virtuoso_url %(virtuoso_url)s, X activated %(activated)s"; return async (data: Omit<Project, "import_recipes">) => { const transaction = new Transaction(); const query = transaction.push(rql, { name: data.name, @@ -96,9 +96,9 @@ return async (data: Omit<Project, "import_recipes">) => { const transaction = new Transaction(); const query = transaction.push(rql, { name: data.name, - sparql_endpoint: data.sparql_endpoint, + virtuoso_url: data.virtuoso_url, activated: data.activated, }); const eidRef = query.ref().row(0).column(0); @@ -112,10 +112,10 @@ export function useApiUpdateProject() { const client = useClient(); const rql = - "SET X name %(name)s, X sparql_endpoint %(sparql_endpoint)s, X activated %(activated)s" + + "SET X name %(name)s, X virtuoso_url %(virtuoso_url)s, X activated %(activated)s" + "WHERE X is ImportProcedure, X eid %(eid)s"; return (data: Omit<Project, "import_recipes">) => { const transaction = new Transaction(); transaction.push(rql, { eid: data.eid, name: data.name, @@ -116,10 +116,10 @@ "WHERE X is ImportProcedure, X eid %(eid)s"; return (data: Omit<Project, "import_recipes">) => { const transaction = new Transaction(); transaction.push(rql, { eid: data.eid, name: data.name, - sparql_endpoint: data.sparql_endpoint, + virtuoso_url: data.virtuoso_url, activated: data.activated, }); pushSetProjectFiles(transaction, data.eid, data); @@ -201,8 +201,8 @@ export function useApiGetProject(): (eid: number) => Promise<Project> { const client = useClient(); const projectRql = - "Any X, ATTR_NAME, ATTR_SPARQL_ENDPOINT, ATTR_ACTIVATED, REL_ONTOLOGY.download_url(), REL_SHACL.download_url() " + - "WHERE X is ImportProcedure, X eid %(eid)s, X name ATTR_NAME, X sparql_endpoint ATTR_SPARQL_ENDPOINT, X activated ATTR_ACTIVATED, X ontology_file REL_ONTOLOGY?, X shacl_files REL_SHACL?"; + "Any X, ATTR_NAME, ATTR_VIRTUOSO_URL, ATTR_ACTIVATED, REL_ONTOLOGY.download_url(), REL_SHACL.download_url() " + + "WHERE X is ImportProcedure, X eid %(eid)s, X name ATTR_NAME, X virtuoso_url ATTR_VIRTUOSO_URL, X activated ATTR_ACTIVATED, X ontology_file REL_ONTOLOGY?, X shacl_files REL_SHACL?"; const recipeListRql = "Any X, ATTR_NAME, ATTR_PROCESS_TYPE , REL_DATASERVICE " + @@ -236,7 +236,7 @@ return { eid: r[0], name: r[1], - sparql_endpoint: r[2], + virtuoso_url: r[2], activated: r[3], import_recipes: recipeListJsonResult, ontology_file: { downloadUrl: r[4] } as CWFile, @@ -369,7 +369,7 @@ ({ eid: r[0], name: r[1], - sparql_endpoint: r[2], + virtuoso_url: r[2], activated: r[3], }) as Project, ); @@ -382,9 +382,9 @@ "WHERE X is DataService, X eid %(eid)s, X name ATTR_NAME, X data_url ATTR_DATA_URL, X refresh_period ATTR_REFRESH_PERIOD, X description ATTR_DESCRIPTION"; const projectListRql = - "Any X, ATTR_NAME, ATTR_SPARQL_ENDPOINT, ATTR_ACTIVATED " + - "GROUPBY X, ATTR_NAME, ATTR_SPARQL_ENDPOINT, ATTR_ACTIVATED " + - "WHERE X is ImportProcedure, X name ATTR_NAME, X sparql_endpoint ATTR_SPARQL_ENDPOINT, X activated ATTR_ACTIVATED, " + + "Any X, ATTR_NAME, ATTR_VIRTUOSO_URL, ATTR_ACTIVATED " + + "GROUPBY X, ATTR_NAME, ATTR_VIRTUOSO_URL, ATTR_ACTIVATED " + + "WHERE X is ImportProcedure, X name ATTR_NAME, X virtuoso_url ATTR_VIRTUOSO_URL, X activated ATTR_ACTIVATED, " + "X import_recipes R, R dataservice %(eid)s"; return async (eid: number) => { @@ -425,9 +425,9 @@ export function useApiGetProjectList(): () => Promise<Array<Project>> { const client = useClient(); const rql = - "Any X, ATTR_NAME, ATTR_SPARQL_ENDPOINT, ATTR_ACTIVATED " + - "GROUPBY X, ATTR_NAME, ATTR_SPARQL_ENDPOINT, ATTR_ACTIVATED " + - "WHERE X is ImportProcedure, X name ATTR_NAME, X sparql_endpoint ATTR_SPARQL_ENDPOINT, X activated ATTR_ACTIVATED"; + "Any X, ATTR_NAME, ATTR_VIRTUOSO_URL, ATTR_ACTIVATED " + + "GROUPBY X, ATTR_NAME, ATTR_VIRTUOSO_URL, ATTR_ACTIVATED " + + "WHERE X is ImportProcedure, X name ATTR_NAME, X virtuoso_url ATTR_VIRTUOSO_URL, X activated ATTR_ACTIVATED"; return async () => { const result = await client.execute(rql, {}); return projectListResultSetToObject(result); diff --git a/frontend/src/app/data-service/[eid]/page.tsx b/frontend/src/app/data-service/[eid]/page.tsx index 18878c69f5f0dd0c2378d6eeb394581216b1a393_ZnJvbnRlbmQvc3JjL2FwcC9kYXRhLXNlcnZpY2UvW2VpZF0vcGFnZS50c3g=..2b379c9ba75cad62b2723a59d2db3a11999d971c_ZnJvbnRlbmQvc3JjL2FwcC9kYXRhLXNlcnZpY2UvW2VpZF0vcGFnZS50c3g= 100644 --- a/frontend/src/app/data-service/[eid]/page.tsx +++ b/frontend/src/app/data-service/[eid]/page.tsx @@ -67,7 +67,7 @@ key={i} name={p.name} activated={p.activated} - sparql_endpoint={p.sparql_endpoint} + virtuoso_url={p.virtuoso_url} canEdit={false} onOpen={() => { router.push("/project/" + p.eid); diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx index 18878c69f5f0dd0c2378d6eeb394581216b1a393_ZnJvbnRlbmQvc3JjL2FwcC9wYWdlLnRzeA==..2b379c9ba75cad62b2723a59d2db3a11999d971c_ZnJvbnRlbmQvc3JjL2FwcC9wYWdlLnRzeA== 100644 --- a/frontend/src/app/page.tsx +++ b/frontend/src/app/page.tsx @@ -63,7 +63,7 @@ key={i} name={p.name} activated={p.activated} - sparql_endpoint={p.sparql_endpoint} + virtuoso_url={p.virtuoso_url} onOpen={() => { router.push("/project/" + p.eid); }} diff --git a/frontend/src/components/ProjectForm.tsx b/frontend/src/components/ProjectForm.tsx index 18878c69f5f0dd0c2378d6eeb394581216b1a393_ZnJvbnRlbmQvc3JjL2NvbXBvbmVudHMvUHJvamVjdEZvcm0udHN4..2b379c9ba75cad62b2723a59d2db3a11999d971c_ZnJvbnRlbmQvc3JjL2NvbXBvbmVudHMvUHJvamVjdEZvcm0udHN4 100644 --- a/frontend/src/components/ProjectForm.tsx +++ b/frontend/src/components/ProjectForm.tsx @@ -88,8 +88,8 @@ )} /> <Controller - name="sparql_endpoint" + name="virtuoso_url" control={control} rules={{ required: true }} render={({ field, fieldState: { error } }) => ( <TextField @@ -92,8 +92,8 @@ control={control} rules={{ required: true }} render={({ field, fieldState: { error } }) => ( <TextField - label="SPARQL endpoint" + label="Virtuoso URL" required={true} disabled={loading} {...field} diff --git a/frontend/src/components/cards/ProjectCard.tsx b/frontend/src/components/cards/ProjectCard.tsx index 18878c69f5f0dd0c2378d6eeb394581216b1a393_ZnJvbnRlbmQvc3JjL2NvbXBvbmVudHMvY2FyZHMvUHJvamVjdENhcmQudHN4..2b379c9ba75cad62b2723a59d2db3a11999d971c_ZnJvbnRlbmQvc3JjL2NvbXBvbmVudHMvY2FyZHMvUHJvamVjdENhcmQudHN4 100644 --- a/frontend/src/components/cards/ProjectCard.tsx +++ b/frontend/src/components/cards/ProjectCard.tsx @@ -14,7 +14,7 @@ interface ProjectCardProps { name: string; activated: boolean; - sparql_endpoint: string; + virtuoso_url: string; canEdit?: boolean; onOpen?: () => void; onToggle?: () => void; @@ -24,7 +24,7 @@ export function ProjectCard({ name, activated, - sparql_endpoint, + virtuoso_url, canEdit = true, onOpen, onToggle, @@ -60,7 +60,7 @@ </Box> ) : null} </Stack> - <Typography variant="body2">{sparql_endpoint}</Typography> + <Typography variant="body2">{virtuoso_url}</Typography> </CardContent> </Box> <CardActions> diff --git a/frontend/src/types.ts b/frontend/src/types.ts index 18878c69f5f0dd0c2378d6eeb394581216b1a393_ZnJvbnRlbmQvc3JjL3R5cGVzLnRz..2b379c9ba75cad62b2723a59d2db3a11999d971c_ZnJvbnRlbmQvc3JjL3R5cGVzLnRz 100644 --- a/frontend/src/types.ts +++ b/frontend/src/types.ts @@ -6,7 +6,7 @@ export type Project = { eid: number; name: string; - sparql_endpoint: string; + virtuoso_url: string; activated: boolean; ontology_file?: CWFile; shacl_files?: CWFile;