fix: update subscription config error when subscription is empty

haydenull · Mar 12, 2022 · 2c9ab2d · 2c9ab2d
1 parent e088cc3
commit 2c9ab2d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -164,7 +164,8 @@ const App: React.FC<{ env: string }> = ({ env }) => {
   }
   const onSettingChange = (values: ISettingsForm) => {
     logseq.updateSettings({calendarList: 1, subscriptionList: 1})
-    logseq.updateSettings(values)
+    // ensure subscription list is array
+    logseq.updateSettings({subscriptionList: [], ...values})
     if (values.weekStartDay !== logseq.settings?.weekStartDay) {
       calendarRef.current?.setOptions({
         week: {

diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
@@ -155,7 +155,7 @@ const Settings: React.FC<{
                     <Form.Item name={[field.name, 'id']} noStyle rules={[{ required: true }]}>
                       <Input placeholder="Calendar ID" style={{ width: '100px' }} />
                     </Form.Item>
-                    <Form.Item name={[field.name, 'url']} noStyle rules={[{ required: true }]}>
+                    <Form.Item name={[field.name, 'url']} noStyle rules={[{ required: true, type: 'url' }]}>
                       <Input placeholder="Url" style={{ width: '100px' }} />
                     </Form.Item>
                     <Form.Item name={[field.name, 'bgColor']} noStyle rules={[{ required: true }]}>

diff --git a/src/util/util.ts b/src/util/util.ts
@@ -380,11 +380,11 @@ export const managePluginTheme = async () => {
  * get ical data
  */
 export const getSubCalendarSchedules = async (subscriptionCalendarList: ISettingsForm['subscriptionList'], defaultDuration?: ISettingsForm['defaultDuration']) => {
+  if (!Array.isArray(subscriptionCalendarList)) return []
   const enabledCalendarList = subscriptionCalendarList?.filter(calendar => calendar.enabled)
   if (!enabledCalendarList?.length) return []
 
   const resList = await Promise.allSettled(enabledCalendarList.map(calendar => axios(calendar.url)))
-  // const resList = await Promise.allSettled(subscriptionCalendarList.map(calendar => ical.fromURL(calendar.url)))
 
   let schedules = []
   resList.forEach((res, index) => {