Corrected some errors in Filter widget

ioBroker · Mar 9, 2024 · 67a7924 · 67a7924
1 parent e4ae7cb
commit 67a7924
Show file tree

Hide file tree

Showing 13 changed files with 219 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -264,7 +264,7 @@ E.g., if it was used in a menu and the menu is red, the circle would be red.
     ### **WORK IN PROGRESS**
 -->
 ## Changelog
-### 2.9.41 (2024-03-09)
+### **WORK IN PROGRESS**
 * (bluefox) Allowed limiting the view size only on desktop
 * (bluefox) Change word "Filter" to "Search"
 

diff --git a/io-package.json b/io-package.json
@@ -3,19 +3,6 @@
     "name": "vis-2",
     "version": "2.9.41",
     "news": {
-      "2.9.41": {
-        "en": "Allowed limiting the view size only on desktop\nChange word \"Filter\" to \"Search\"",
-        "de": "Erlaubt, die Ansichtsgröße nur auf dem Desktop zu begrenzen\nWort \"Filter\" zu \"Search\" ändern",
-        "ru": "Разрешено ограничивать размер обзора только на настольном\nСменить слово \"Фильтер\" на \"Сеарх\"",
-        "pt": "Permite limitar o tamanho da vista apenas na área de trabalho\nAlterar palavra \"Filter\" para \"Search\"",
-        "nl": "Toegestaan om de weergavegrootte alleen op bureaublad te beperken\nWijzig woord \"Filter\" in \"Zoeken\"",
-        "fr": "Limiter la taille de la vue uniquement sur le bureau\nChanger le mot \"Filter\" en \"Rechercher\"",
-        "it": "Limitare la dimensione della vista solo sul desktop\nCambia la parola \"Filter\" a \"Search\"",
-        "es": "Permitido limitar el tamaño de la vista sólo en el escritorio\nCambiar la palabra \"Filter\" a \"Search\"",
-        "pl": "Dozwolone ograniczenie rozmiaru widoku tylko na pulpicie\nZmień słowo \"Filtr\" na \"Szukaj\"",
-        "uk": "Допускається обмеження розміру переглядів тільки на робочому столі\nЗміна слова \"Фільтр\" в \"Пошук\"",
-        "zh-cn": "只允许限制桌面上的视图大小\n将\"Filter\"改为\"Search\""
-      },
       "2.9.40": {
         "en": "Migrated the filter widget to react\nMigrated the basic link widget to react",
         "de": "Das Filter-Widget migriert\nDas grundlegende Link-Widget migriert",

diff --git a/src/src/Attributes/View.jsx b/src/src/Attributes/View.jsx
@@ -306,7 +306,7 @@ const View = props => {
                 {
                     name: 'Width',
                     field: 'bg-width',
-                    type: 'type',
+                    type: 'text',
                     hidden: '!data["bg-image"]',
                     notStyle: true,
                 },

diff --git a/src/src/Attributes/Widget/WidgetBindingField.jsx b/src/src/Attributes/Widget/WidgetBindingField.jsx
@@ -1027,7 +1027,7 @@ class WidgetBindingField extends Component {
         }
         return <SelectID
             key="selectDialog"
-            imagePrefix="../.."
+            imagePrefix="../"
             selected={this.state.selectionValue}
             onOk={async selected => {
                 // insert on cursor and replace selected text

diff --git a/src/src/Attributes/Widget/WidgetField.jsx b/src/src/Attributes/Widget/WidgetField.jsx
@@ -584,7 +584,7 @@ const WidgetField = props => {
                 {objectCache ? (typeof objectCache.common.name === 'object' ? objectCache.common.name[I18n.lang] : objectCache.common.name) : null}
             </div>
             {idDialog && !disabled ? <SelectID
-                imagePrefix="../.."
+                imagePrefix="../"
                 selected={value}
                 onOk={selected => change(selected)}
                 onClose={() => setIdDialog(false)}

diff --git a/src/src/Toolbar/Projects.jsx b/src/src/Toolbar/Projects.jsx
@@ -69,7 +69,7 @@ const Tools = props => {
         /> : null}
         {
             objectsDialog ? <SelectID
-                imagePrefix="../.."
+                imagePrefix="../"
                 ready
                 onClose={() => setObjectsDialog(false)}
                 socket={props.socket}

diff --git a/src/src/Vis/Widgets/Basic/BasicFilterDropdown.tsx b/src/src/Vis/Widgets/Basic/BasicFilterDropdown.tsx
@@ -143,10 +143,6 @@ class BasicFilterDropdown extends VisRxWidget<RxData> {
                         />,
                         default: '[]',
                     },
-                    {
-                        name: 'widgetTitle',
-                        label: 'name',
-                    },
                     {
                         name: 'type',
                         label: 'Type',
@@ -167,6 +163,11 @@ class BasicFilterDropdown extends VisRxWidget<RxData> {
                         ],
                         default: 'horizontal_buttons',
                     },
+                    {
+                        name: 'widgetTitle',
+                        label: 'name',
+                        hidden: 'data.type !== "dropdown"',
+                    },
                     {
                         name: 'autoFocus',
                         type: 'checkbox',
@@ -404,7 +405,7 @@ class BasicFilterDropdown extends VisRxWidget<RxData> {
                     startIcon={image ? <Icon src={image} alt={option.label} style={{ height: 24 }} /> : null}
                     style={{
                         flexGrow: 1,
-                        color: viewsActiveFilter.includes(option.value) ? option.color : (option.activeColor || option.color),
+                        color: viewsActiveFilter.includes(option.value) ? (option.activeColor || option.color) : option.color,
                     }}
                 >
                     {option.label}

diff --git a/src/src/Vis/Widgets/Basic/FiltersEditorDialog.tsx b/src/src/Vis/Widgets/Basic/FiltersEditorDialog.tsx
@@ -204,7 +204,7 @@ class FiltersEditorDialog extends Component<FiltersEditorDialogProps, FiltersEdi
             return null;
         }
 
-        let _value = this.state.items[this.state.selectImage as number].image || '';
+        let _value = this.state.items[this.state.selectImage].image || '';
         if (_value.startsWith('../')) {
             _value = _value.substring(3);
         } else if (_value.startsWith('_PRJ_NAME/')) {
@@ -244,6 +244,15 @@ class FiltersEditorDialog extends Component<FiltersEditorDialogProps, FiltersEdi
     }
 
     renderTableRow(item: Item, index: number) {
+        let image = item.image;
+        if (image) {
+            if (image.startsWith('../')) {
+                image = image.substring(3);
+            } else if (image.startsWith('_PRJ_NAME/')) {
+                image = image.replace('_PRJ_NAME/', `../${this.props.context.adapterName}.${this.props.context.instance}/${this.props.context.projectName}/`);
+            }
+        }
+
         return <Draggable key={item.id} draggableId={item.id || ''} index={index}>
             {(dragProvided /* dragSnapshot */) => <TableRow
                 className={index % 2 ? this.props.classes.rowEven : ''}
@@ -346,12 +355,12 @@ class FiltersEditorDialog extends Component<FiltersEditorDialogProps, FiltersEdi
                             }}
                         />
                         <Button
-                            variant={item.image ? 'outlined' : undefined}
+                            variant={image ? 'outlined' : undefined}
                             // @ts-expect-error grey is correct
-                            color={item.image ? 'grey' : undefined}
+                            color={image ? 'grey' : undefined}
                             onClick={() => this.setState({ selectImage: index })}
                         >
-                            {item.image ? <Icon src={item.image} style={{ width: 36, height: 36 }} /> : '...'}
+                            {image ? <Icon src={image} style={{ width: 36, height: 36 }} /> : '...'}
                         </Button>
                     </div>}
                 </TableCell>

diff --git a/src/src/Vis/visContextMenu.tsx b/src/src/Vis/visContextMenu.tsx
@@ -55,6 +55,27 @@ interface VisContextMenuProps {
     setMarketplaceDialog: (data: { addPage: boolean; widget: { widget: (SingleWidget | GroupWidget)[]; image: string } }) => void;
 }
 
+interface VisMarketplaceProps {
+    language: ioBroker.Languages;
+    addPage?: boolean;
+    widget: { name: string; date: string; widget_id: string; image_id: string; };
+    installWidget: (widget: { name: string; date: string; widget_id: string; image_id: string; }) => Promise<void>;
+    installedWidgets?: {id: string}[];
+    themeName: string;
+    onAdded?: () => void;
+}
+
+declare global {
+    interface Window {
+        VisMarketplace?: {
+            api: {
+                apiGetWidgetRevision(widgetId: string, id: string): Promise<any>;
+            },
+            default: React.Component<VisMarketplaceProps>
+        };
+    }
+}
+
 const VisContextMenu = (props: VisContextMenuProps) => {
     const [exportDialog, setExportDialog] = useState(false);
     const [importDialog, setImportDialog] = useState(false);
@@ -149,7 +170,7 @@ const VisContextMenu = (props: VisContextMenuProps) => {
                 hide: props.selectedWidgets.length !== 1 ||
                     selectedWidget.tpl !== '_tplGroup',
             },
-            (window as any).VisMarketplace ? {
+            window.VisMarketplace ? {
                 leftIcon: <img
                     src="./img/marketplace.png"
                     alt="widgeteria"