Skip to content

ENG-2050 Re-introduce spaceId (optional) in the CrossApp base #1282

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

Open
maparent wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −0
Open

ENG-2050 Re-introduce spaceId (optional) in the CrossApp base #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/database/src/crossAppContracts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type Rid = string;
// Common attributes for most types
export type CrossAppBase = {
localId: LocalId;
rid?: string;
createdAt: Date;
modifiedAt?: Date;
authorId: LocalId;
Expand Down
21 changes: 21 additions & 0 deletions packages/database/src/lib/crossAppConverters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
CrossAppRelation,
} from "../crossAppContracts";
import { LocalContentDataInput, LocalConceptDataInput } from "../inputTypes";
import { ridToSpaceUriAndLocalId } from "./rid";
import { Enums, CompositeTypes } from "../dbTypes";

type InlineEmbeddingInput = CompositeTypes<"inline_embedding_input">;
Expand Down Expand Up @@ -70,7 +71,11 @@ export const crossAppNodeToDbContent = (
export const crossAppNodeToDbConcept = (
node: CrossAppNode,
): LocalConceptDataInput => {
const spaceUri = node.rid
? ridToSpaceUriAndLocalId(node.rid).spaceUri
: undefined;
return filterUndefined<LocalConceptDataInput>({
space_url: spaceUri,
source_local_id: node.localId,
name: node.content.direct.value,
author_local_id: node.authorId,
Expand All @@ -91,7 +96,11 @@ export const crossAppNodeSchemaToDbConcept = (
template: node.templateTitle,
template_content: node.template,
});
const spaceUri = node.rid
? ridToSpaceUriAndLocalId(node.rid).spaceUri
: undefined;
return filterUndefined<LocalConceptDataInput>({
space_url: spaceUri,
source_local_id: node.localId,
name: node.label,
author_local_id: node.authorId,
Expand All @@ -106,7 +115,11 @@ export const crossAppNodeSchemaToDbConcept = (
export const crossAppRelationTypeSchemaToDbConcept = (
node: CrossAppRelationTypeSchema,
): LocalConceptDataInput => {
const spaceUri = node.rid
? ridToSpaceUriAndLocalId(node.rid).spaceUri
: undefined;
return filterUndefined<LocalConceptDataInput>({
space_url: spaceUri,
source_local_id: node.localId,
name: node.label,
author_local_id: node.authorId,
Expand All @@ -130,7 +143,11 @@ export const crossAppRelationTripleSchemaToDbConcept = (
const label = "label" in node ? node.label : relationType!.label;
const complement =
"complement" in node ? node.complement : relationType!.complement;
const spaceUri = node.rid
? ridToSpaceUriAndLocalId(node.rid).spaceUri
: undefined;
return filterUndefined<LocalConceptDataInput>({
space_url: spaceUri,
source_local_id: node.localId,
name: node.localId, // has to be unique within space. Not seen yet.
author_local_id: node.authorId,
Expand All @@ -153,9 +170,13 @@ export const crossAppRelationTripleSchemaToDbConcept = (
export const crossAppRelationToDbConcept = (
node: CrossAppRelation,
): LocalConceptDataInput => {
const spaceUri = node.rid
? ridToSpaceUriAndLocalId(node.rid).spaceUri
: undefined;
return filterUndefined<LocalConceptDataInput>({
// use LocalIds... not ideal
name: `${node.localId}: ${node.source} -${node.relationType}-> ${node.destination}`,
space_url: spaceUri,
source_local_id: node.localId,
author_local_id: node.authorId,
schema_represented_by_local_id: node.relationType,
Expand Down