feat: ✨ supports simple query

haydenull · Mar 13, 2022 · a65131f · a65131f
1 parent d3b3e5f
commit a65131f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/components/QueryModal.tsx b/src/components/QueryModal.tsx
@@ -59,7 +59,7 @@ const QueryModal: React.FC<Partial<{
                     <Row gutter={16}>
                       <Col span={12}>
                         <Form.Item label="script" name={[field.name, 'script']} labelCol={{ span: 4 }}>
-                          <Input.TextArea rows={8} />
+                          <Input.TextArea rows={10} />
                         </Form.Item>
                       </Col>
                       <Col span={12}>

diff --git a/src/util/util.ts b/src/util/util.ts
@@ -2,10 +2,9 @@ import dayjs from 'dayjs'
 import { flattenDeep, get } from 'lodash'
 import en from 'dayjs/locale/en'
 import { ISchedule } from 'tui-calendar'
-import { DAILY_LOG_CONFIG, DEFAULT_BLOCK_DEADLINE_DATE_FORMAT, DEFAULT_JOURNAL_FORMAT, DEFAULT_SETTINGS, SHOW_DATE_FORMAT } from './constants'
+import { DEFAULT_BLOCK_DEADLINE_DATE_FORMAT, DEFAULT_JOURNAL_FORMAT, DEFAULT_SETTINGS, SHOW_DATE_FORMAT } from './constants'
 import axios from 'axios'
 import ical from 'ical.js'
-// import ical from 'node-ical'
 
 dayjs.locale({
   ...en,
@@ -86,8 +85,13 @@ export const getSchedules = async () => {
 
   const queryPromiseList = scheduleQueryList.map(async queryWithCalendar => {
     const { calendarConfig, query } = queryWithCalendar
-    const { script = '', scheduleStart = '', scheduleEnd = '', dateFormatter, isMilestone } = query
-    const blocks = await logseq.DB.datascriptQuery(script)
+    const { script = '', scheduleStart = '', scheduleEnd = '', dateFormatter, isMilestone, queryType } = query
+    let blocks: any[] = []
+    if (queryType === 'query') {
+      blocks = await logseq.DB.q(script) || []
+    } else {
+      blocks = await logseq.DB.datascriptQuery(script)
+    }
     console.log('[faiz:] === search blocks by query: ', script, blocks)
 
     return flattenDeep(blocks).map(block => {