feat: hidden-graph

move flag from Cube Metadata to Project (cc:isHiddenCube)
zazuko · Mar 6, 2024 · dcf7065 · dcf7065
1 parent d93e2e0
commit dcf7065
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/apis/core/bootstrap/shapes/cube-project.ts b/apis/core/bootstrap/shapes/cube-project.ts
@@ -1,5 +1,5 @@
 import { cc, sh1, shape, editor } from '@cube-creator/core/namespace'
-import { dash, dcterms, hydra, rdf, rdfs, schema, sh } from '@tpluscode/rdf-ns-builders'
+import { dash, dcterms, hydra, rdf, rdfs, schema, sh, xsd } from '@tpluscode/rdf-ns-builders'
 import { turtle } from '@tpluscode/rdf-string'
 import $rdf from 'rdf-ext'
 
@@ -144,6 +144,16 @@ const projectProperties = ({ xoneAlternatives = [] }: { xoneAlternatives?: unkno
     ${hydra.collection} <organizations> ;
     ${sh.order} 20 ;
   ] ;
+  ${sh.property} [
+    ${sh.name} "Hide this cube?" ;
+    ${sh.description} "Hidden cubes are only visible in *visualize* for logged-in users" ;
+    ${sh.path} ${cc.isHiddenCube} ;
+    ${sh.datatype} ${xsd.boolean} ;
+    ${sh.defaultValue} ${true} ;
+    ${sh.minCount} 1 ;
+    ${sh.maxCount} 1 ;      
+    ${sh.order} 21 ;
+  ] ;
   ${sh.xone} ( ${xoneAlternatives} ) ;`
 
 export const CubeProjectShape = turtle`

diff --git a/apis/core/bootstrap/shapes/dataset.ts b/apis/core/bootstrap/shapes/dataset.ts
@@ -1,4 +1,4 @@
-import { shape, editor, lindasSchema, cc } from '@cube-creator/core/namespace'
+import { shape, editor, lindasSchema } from '@cube-creator/core/namespace'
 import { supportedLanguages } from '@cube-creator/core/languages'
 import { hydra, rdfs, sh, dcat, dcterms, xsd, rdf, vcard, schema, _void, dash, skos } from '@tpluscode/rdf-ns-builders'
 import { sparql, turtle } from '@tpluscode/rdf-string'
@@ -209,19 +209,6 @@ ${shapeId} {
       ${sh.description} "Only published datasets will be listed in the external tools. A draft will be nevertheless be public." ;
       ${sh.group} ${mainGroup} ;
     ] ;
-
-    ${sh.property} [
-      ${sh.name} "Hide this cube?" ;
-      ${sh.path} ${cc.isHiddenCube} ;
-      ${sh.datatype} ${xsd.boolean} ;
-      ${sh.defaultValue} ${false} ;
-      ${sh.minCount} 1 ;
-      ${sh.maxCount} 1 ;      
-      ${sh.order} 31 ;
-      ${sh.description} "Hidden cubes are only visible in *visualize* for logged-in users" ;
-      ${sh.group} ${mainGroup} ;
-    ] ;
-
     ${sh.property} [
         ${sh.name} "Publish to" ;
         ${sh.path} ${schema.workExample} ;

diff --git a/apis/core/lib/domain/job/create.ts b/apis/core/lib/domain/job/create.ts
@@ -76,7 +76,7 @@ export async function createPublishJob({
 
   const metadata = await store.getResource(project.dataset)
 
-  const targetGraph = metadata.isHiddenCube ? $rdf.namedNode(organization.publishGraph.value + '/hidden') : organization.publishGraph
+  const targetGraph = project.isHiddenCube ? $rdf.namedNode(organization.publishGraph.value + '/hidden') : organization.publishGraph
 
   const jobPointer = await store.createMember(jobCollection.term, id.job(jobCollection))
   const job = Job.createPublish(jobPointer, {

diff --git a/packages/model/Dataset.ts b/packages/model/Dataset.ts
@@ -16,7 +16,6 @@ export interface Dataset extends RdfResource {
   title: Literal[]
   created: Date
   published: Date
-  isHiddenCube: boolean
 }
 
 export const Error = {
@@ -44,9 +43,6 @@ export function DatasetMixin<Base extends Constructor>(Resource: Base): Mixin {
 
     @property.literal({ path: schema.datePublished, type: Date, datatype: xsd.date })
     published!: Date
-
-    @property.literal({ path: cc.isHiddenCube, datatype: xsd.boolean })
-    isHiddenCube!: boolean
   }
 
   return Impl

diff --git a/packages/model/Project.ts b/packages/model/Project.ts
@@ -5,7 +5,7 @@ import type { GraphPointer } from 'clownface'
 import RdfResourceImpl, { Initializer, RdfResourceCore } from '@tpluscode/rdfine/RdfResource'
 import { Mixin } from '@tpluscode/rdfine/lib/ResourceFactory'
 import { cc, lindasSchema } from '@cube-creator/core/namespace'
-import { dcterms, schema } from '@tpluscode/rdf-ns-builders'
+import { dcterms, schema, xsd } from '@tpluscode/rdf-ns-builders'
 import { Organization, Person, PersonMixin } from '@rdfine/schema'
 import type { Collection } from '@rdfine/hydra'
 import { initializer } from './lib/initializer'
@@ -28,6 +28,7 @@ export interface Project extends RdfResource {
   export: Link
   details: Link
   plannedNextUpdate?: Date
+  isHiddenCube: boolean
 }
 
 export interface CsvProject extends Project {
@@ -97,6 +98,9 @@ export function ProjectMixin<Base extends Constructor>(base: Base): Mixin {
 
     @property.literal({ path: lindasSchema.datasetNextDateModified, type: Date })
     plannedNextUpdate?: Date
+
+    @property.literal({ path: cc.isHiddenCube, datatype: xsd.boolean })
+    isHiddenCube!: boolean
   }
 
   return Impl