@live-change/content-frontend 0.2.5 → 0.2.6

package/front/src/components/MetadataEditor.vue

@@ -0,0 +1,57 @@
+<template>
+  <auto-input v-model="editable.title" :definition="properties.title" />
+
+</template>
+
+<script setup>
+
+  import AutoInput from '@live-change/frontend-auto-form/AutoInput.vue'
+
+  import { computed, watch, ref, onMounted, inject } from 'vue'
+  import { toRefs } from "@vueuse/core"
+
+  const isMounted = ref(false)
+  onMounted(() => isMounted.value = true)
+
+  const props = defineProps({
+    objectType: {
+      type: String,
+      required: true
+    },
+    object: {
+      type: String,
+      required: true
+    }
+  })
+
+  const { objectType, object } = props
+
+  import { useApi, path, live } from '@live-change/vue3-ssr'
+  const api = useApi()
+  const p = path()
+
+  const definition = api.getServiceDefinition('content').models.Metadata
+  const properties = definition.properties
+
+  import { synchronized } from "@live-change/vue3-components"
+
+  const metadata = await live(p.content.objectOwnedMetadata({ objectType, object }))
+
+  const synchronizedMetadata = synchronized({
+    source: metadata,
+    update: api.actions.content.setOrUpdateObjectOwnedMetadata,
+    identifiers: { object, objectType },
+    recursive: true,
+    autoSave: false,
+    onSave: () => toast.add({ severity: 'info', summary: 'Public access saved', life: 1500 })
+  }).value
+
+  const editable = synchronizedMetadata.value
+  const save = synchronizedMetadata.save
+  const changed = synchronizedMetadata.changed
+
+</script>
+
+<style scoped>
+
+</style>

package/front/src/components/PageEditor.vue

@@ -1,17 +1,24 @@
 <template>
-  <Accordion v-if="pageData" :multiple="true" class="w-full">
+  <Accordion v-if="pageData" :multiple="true" class="w-full mb-2">
     <AccordionTab>
       <template #header>
         <UrlsInfo targetType="content_Page" :target="pageId" class="w-full" />
       </template>
       <Urls :key="pageId" targetType="content_Page" :target="pageId" />
     </AccordionTab>
-<!--<AccordionTab header="Header II">
-      Content
+    <AccordionTab>
+      <template #header>
+        <span class="font-bold mr-1">Public access: {{ publicAccessLevel }}</span>
+      </template>
+      <AccessControl objectType="content_Page" :object="pageId" />
+    </AccordionTab>
+    <AccordionTab>
+      <template #header>
+        <span v-if="metadata" class="font-bold mr-1">Title: {{ metadata.title }}</span>
+        <span v-else class="font-bold text-red-600">Metadata not set</span>
+      </template>
+      <MetadataEditor objectType="content_Page" :object="pageId" :key="pageId"></MetadataEditor>
     </AccordionTab>
-    <AccordionTab header="Header III">
-      Content
-    </AccordionTab>-->
   </Accordion>
 
   <DocumentEditor v-if="pageData" targetType="content_Page" :target="pageId"
@@ -25,7 +32,7 @@
                 class="p-button p-component p-button-sm p-button-outlined p-button-secondary cursor-auto inline-block"
                 :class="{ 'p-disabled': saveState == 'saving' }">
           <span class="pi p-button-icon p-button-icon-left"
-                :class="[stateSave == 'saving' ? 'pi-sync' : 'pi-hashtag' ]" />
+                :class="[saveState == 'saving' ? 'pi-sync' : 'pi-hashtag' ]" />
           <span class="p-button-label">{{ ( version ?? 0 ).toFixed().padStart(10, '0') }}</span>
         </button>
         <Button icon="pi pi-save" label="Publish" class="p-button-success p-button-sm" type="button"
@@ -46,6 +53,8 @@
 
   import { UrlsInfo, Urls, NotFound } from '@live-change/url-frontend'
   import { DocumentEditor, EditorMenu } from "@live-change/wysiwyg-frontend"
+  import { AccessControl } from '@live-change/access-control-frontend'
+  import MetadataEditor from "./MetadataEditor.vue"
   import contentConfig from "./contentConfig.js";
 
   import { computed, watch, ref, onMounted, inject } from 'vue'
@@ -88,11 +97,26 @@
   const liveCanonicalUrlPath = computed(
     () =>  p.url.targetOwnedCanonical({ targetType: 'content_Page', target: pageId.value })
   )
-  const [pageData, canonicalUrlData] = await Promise.all([
+  const livePublicAccessPath = computed(
+    () =>  p.accessControl.objectOwnedPublicAccess({ objectType: 'content_Page', object: pageId.value })
+  )
+  const liveMetadataPath = computed(
+    () =>  p.content.objectOwnedMetadata({ objectType: 'content_Page', object: pageId.value })
+  )
+
+  const [pageData, canonicalUrlData, publicAccessData, metadata] = await Promise.all([
     live(livePagePath),
-    live(liveCanonicalUrlPath)
+    live(liveCanonicalUrlPath),
+    live(livePublicAccessPath),
+    live(liveMetadataPath)
   ])
 
+  const publicAccessLevel = computed(() => {
+    if(publicAccessData?.sessionRoles?.includes('reader')) return 'session'
+    if(publicAccessData?.userRoles?.includes('reader')) return 'user'
+    return 'none'
+  })
+
   function publish() {
     const snapshotVersion = version.value
 
@@ -116,7 +140,6 @@
       }
     })
 
-
   }
 
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/content-frontend",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "scripts": {
     "memDev": "lcli memDev --enableSessions --initScript ./init.js --dbAccess",
     "localDevInit": "rm tmp.db; lcli localDev --enableSessions --initScript ./init.js",
@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.1.1",
-    "@live-change/cli": "0.7.2",
-    "@live-change/dao": "0.5.6",
-    "@live-change/dao-vue3": "0.5.6",
-    "@live-change/dao-websocket": "0.5.6",
-    "@live-change/framework": "0.7.2",
-    "@live-change/image-service": "0.3.0",
-    "@live-change/session-service": "0.3.0",
+    "@live-change/cli": "0.7.4",
+    "@live-change/dao": "0.5.8",
+    "@live-change/dao-vue3": "0.5.8",
+    "@live-change/dao-websocket": "0.5.8",
+    "@live-change/framework": "0.7.4",
+    "@live-change/image-service": "0.3.2",
+    "@live-change/session-service": "0.3.2",
     "@live-change/vue3-components": "0.2.15",
     "@live-change/vue3-ssr": "0.2.15",
     "@tiptap/extension-highlight": "^2.0.0-beta.33",
@@ -54,7 +54,7 @@
     "vue3-scroll-border": "0.1.2"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "0.7.2",
+    "@live-change/codeceptjs-helper": "0.7.4",
     "@wdio/selenium-standalone-service": "^7.20.8",
     "codeceptjs": "^3.3.4",
     "generate-password": "1.7.0",
@@ -66,5 +66,5 @@
   "author": "",
   "license": "ISC",
   "description": "",
-  "gitHead": "76ac0dd54acf671cb564a1aa943d81a9e2bc99e9"
+  "gitHead": "323185f6d910912093b3c92df102d0f938cef367"
 }

package/server/init.js

@@ -3,67 +3,70 @@ const App = require('@live-change/framework')
 const app = App.app()
 
 module.exports = async function(services) {
-  const user1 = await createUser(services,
-    'Test User 1', 'test1@test.com', 'Testy123', 'u1', ['writer'])
+  async function createPage(pageId) {
+    const documentId = App.encodeIdentifier(['content_Page', pageId])
+    const snapshotId = App.encodeIdentifier([documentId, (0).toFixed().padStart(10, '0')])
 
-  const pageId = 'one'
-  const documentId = App.encodeIdentifier(['content_Page', 'one'])
-  const snapshotId = App.encodeIdentifier([documentId, (0).toFixed().padStart(10, '0')])
+    const documentContent = {
+      "type": "doc",
+      "content": [].concat(new Array(2).fill(
+        {
+          "type": "paragraph",
+          "content": [
+            {
+              "type": "text",
+              "text": "test"
+            },
+            {
+              "type": "text",
+              "marks": [
+                {
+                  "type": "bold"
+                }
+              ],
+              "text": "est"
+            }
+          ]
+        }
+      ))
+    }
+    const documentTime = new Date()
 
-  const documentContent = {
-    "type": "doc",
-    "content": [].concat(new Array(2).fill(
-      {
-        "type": "paragraph",
-        "content": [
-          {
-            "type": "text",
-            "text": "test"
-          },
-          {
-            "type": "text",
-            "marks": [
-              {
-                "type": "bold"
-              }
-            ],
-            "text": "est"
-          }
-        ]
-      }
-    ))
-  }
-  const documentTime = new Date()
+    await services.content.models.Page.create({
+      id: pageId
+    })
 
-  await services.content.models.Page.create({
-    id: pageId
-  })
+    await services.prosemirror.models.Document.create({
+      id: documentId,
+      ownerType: 'content_Page',
+      owner: pageId,
+      type: 'content',
+      purpose: 'page',
+      version: 1,
+      content: documentContent,
+      created: documentTime,
+      lastModified: documentTime
+    })
+    await services.prosemirror.models.Snapshot.create({
+      id: snapshotId,
+      document: documentId,
+      version: 1,
+      content: documentContent,
+      timestamp: documentTime,
+    })
 
-  await services.prosemirror.models.Document.create({
-    id: documentId,
-    ownerType: 'content_Page',
-    owner: 'one',
-    type: 'content',
-    purpose: 'page',
-    version: 1,
-    content: documentContent,
-    created: documentTime,
-    lastModified: documentTime
-  })
-  await services.prosemirror.models.Snapshot.create({
-    id: snapshotId,
-    document: documentId,
-    version: 1,
-    content: documentContent,
-    timestamp: documentTime,
-  })
+    await services.content.models.Content.create({
+      id: documentId,
+      objectType: 'content_Page',
+      object: pageId,
+      snapshot: snapshotId
+    })
+  }
 
-  await services.content.models.Content.create({
-    id: App.encodeIdentifier(['content_Page', 'one']),
-    objectType: 'content_Page',
-    object: 'one',
-    snapshot: snapshotId
-  })
+  const user1 = await createUser(services,
+    'Test User 1', 'test1@test.com', 'Testy123', 'u1', ['writer', 'administrator'])
+
+  await createPage('one')
 
   await services.accessControl.models.PublicAccess.create({
     id: App.encodeIdentifier(['content_Page', 'one']),
@@ -93,4 +96,13 @@ module.exports = async function(services) {
     target: 'one'
   })
 
+  await createPage('two')
+
+  await services.url.models.Canonical.create({
+    id: App.encodeIdentifier(['content_Page', 'two']),
+    domain: '',
+    path: 'test2',
+    targetType: 'content_Page',
+    target: 'two'
+  })
 }