v6.3.0 (#52)

* chore: release v6.3.0 --------- Co-authored-by: RdeLange <[email protected]>
open-nomie · Feb 14, 2023 · 1e89747 · 1e89747
1 parent aab2057
commit 1e89747
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nomie",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "homepage": "https://github.com/open-nomie/nomie-oss",
   "bugs": {
     "url": "https://github.com/open-nomie/nomie-oss/issues",

diff --git a/src/domains/dashboard2/widget/types/widget-plugin.svelte b/src/domains/dashboard2/widget/types/widget-plugin.svelte
@@ -1,22 +1,23 @@
 <script lang="ts">
-  import { Lang } from '../../../../store/lang'
 
-  import type { TrackableUsage } from '../../../usage/trackable-usage.class'
-  // import type { Trackable } from '../../../trackable/Trackable.class'
   import type { WidgetClass } from '../widget-class'
   import { PluginStore } from '../../../plugins/PluginStore'
   import type { PluginClass } from '../../../plugins/plugin-helpers'
   import PluginFrame from '../../../plugins/plugin-frame.svelte'
   export let widget: WidgetClass
   // export let trackable: Trackable
   let plugin: PluginClass
+  let widgetindexparam: string =  "";
   $: if (widget && widget.data?.pluginId) {
-    plugin = $PluginStore.find((p) => p.id == widget.data.pluginId && p.active == true)
+      if (widget.data.widgetindex){
+        widgetindexparam = '&widgetindex='+widget.data.widgetindex;
+      }
+      plugin = $PluginStore.find((p) => p.id == widget.data.pluginId && p.active == true)
   }
 </script>
 
 {#if plugin}
-  <PluginFrame lid="widget-{widget.id}" openAction="onWidget" {plugin} />
+  <PluginFrame lid="widget-{widget.id}" openAction="onWidget" {plugin} {widgetindexparam}/>
 {:else}
   <div class="w-full h-full flex text-xs text-gray-500 items-center justify-center">
     Plugin not found or disabled

diff --git a/src/domains/dashboard2/widget/widget-editor/widget-editor-modal.svelte b/src/domains/dashboard2/widget/widget-editor/widget-editor-modal.svelte
@@ -32,8 +32,9 @@
   import { isTruthy } from '../../../../utils/truthy/truthy'
   import { closeModal } from '../../../../components/backdrop/BackdropStore2'
   import BackdropModal from '../../../../components/backdrop/backdrop-modal.svelte'
-import CloseOutline from '../../../../n-icons/CloseOutline.svelte'
-import { PluginStore } from "../../../plugins/PluginStore";
+  import CloseOutline from '../../../../n-icons/CloseOutline.svelte'
+  import { PluginStore } from "../../../plugins/PluginStore";
+  import Storage from '../../../../domains/storage/storage'
 
   let visible: boolean = false
   let editingWidget: WidgetClass | undefined
@@ -57,6 +58,9 @@ import { PluginStore } from "../../../plugins/PluginStore";
 
   $: if (editingWidget.type) {
     activeType = widgetTypes.find((wt) => wt.id === editingWidget.type)
+    if (editingWidget.type == "plugin"){
+      pluginGetWidgets(editingWidget.data.pluginId);
+    }
   }
 
   let lastWidgetHash: string | undefined = undefined
@@ -70,6 +74,32 @@ import { PluginStore } from "../../../plugins/PluginStore";
     }
   }
 
+  let pluginWidgets = [];
+  async function pluginGetWidgets(pluginId:String) {
+    let path = `plugins/${pluginId}/prefs.json`
+    let data: any = undefined
+    try {
+      data = await Storage.get(path) || {widgets:[]};
+      pluginWidgets = data.widgets;
+      if (pluginWidgets == undefined || !validateWidgetParams(data.widgets)){pluginWidgets = [];}
+    } catch (e) {
+      console.error(e)
+      pluginWidgets = [];
+    }
+  }
+
+  function validateWidgetParams(widgets){
+    let valid = true;
+    let i = 0;
+    while (i < widgets.length) {
+    if (!widgets[i].emoji || !widgets[i].name || !widgets[i].widgetid || widgets[i].emoji =="" || widgets[i].name =="" || widgets[i].widgetid ==""){
+      valid = false;
+      }
+      i++;
+    }   
+    return valid;
+  }
+
   const close = async () => {
     closeModal(id)
   }
@@ -214,6 +244,31 @@ import { PluginStore } from "../../../plugins/PluginStore";
       </List>
     {/if}
 
+    <!-- Plugins -->
+    {#if activeType?.id == 'plugin'}
+    {#if pluginWidgets.length > 0}
+    <List solo className="mt-4">
+    <Input listItem bind:value={editingWidget.data.widgetindex} type="select" label="Widget">
+      <div
+        slot="left"
+        class="{!editingWidget.data.widgetindex
+          ? 'pl-2 pt-3 w-full'
+          : ''} text-black dark:text-white pointer-events-none absolute"
+      >
+        {#if !editingWidget.data.widgetindex}
+          Select a Widget
+        {/if}
+      </div>
+      {#each pluginWidgets as pluginWidget}
+        <option value={pluginWidget.widgetid}>{pluginWidget.emoji} {pluginWidget.name}</option>
+      {/each}
+    </Input>
+
+        <div class="text-gray-500 leading-tight px-4 text-sm pb-4">Select your Widget for this Plugin</div>
+      </List>
+    {/if}
+    {/if}
+
     <!-- Start Conditional Styling -->
     {#if activeType && [...activeType.requires, ...activeType.optional].indexOf('cond-style') > -1}
       <List solo className="mt-4">

diff --git a/src/domains/plugins/plugin-frame.svelte b/src/domains/plugins/plugin-frame.svelte
@@ -8,6 +8,7 @@
 
   export let plugin: PluginClass
   export let openAction: PluginUseTypes = 'onUIOpened'
+  export let widgetindexparam: string = "";
   export let lid: string
 
   let registered: boolean = false
@@ -17,6 +18,7 @@
 
   $: if (registered && !ready && mounted) {
     ready = true
+    plugin.url 
     broadcastPluginMessage(
       {
         action: openAction,
@@ -72,6 +74,6 @@
   }}
   class="h-full w-full "
   title={plugin.name}
-  src={plugin.urlWithParams}
+  src={plugin.urlWithParams}{widgetindexparam}
   id="plugin-{lid}-{plugin.id}"
 />