Update components

src/Components/avatar/avatar.jsx

@@ -0,0 +1,45 @@
+import React from "react";
+import { Avatar } from "antd";
+import useDashboardEvent from "../Hooks/useDashboardEvent.jsx";
+
+
+const AntdAvatar = props => {
+    const [state, reload] = useDashboardEvent(props.id, props);
+    const { content, attributes } = state;
+
+    const contentProps = {
+        children: content
+    }
+
+    const imageProps = {
+        src: attributes.src,
+        srcSet: attributes.srcSet,
+        alt: attributes.alt
+    }
+
+    const iconProps = {
+        children: UniversalDashboard.renderComponent(content)
+    }
+
+    let propsToUse
+    switch(attributes.parameterSet){
+        case 'Icon':
+            propsToUse = {...iconProps}
+            break
+        case 'Image':
+            propsToUse = {...imageProps}
+            break
+        case 'Content':
+            propsToUse = {...contentProps}
+            break
+        default:
+            console.log('No ParameterSet Was Selected!, Please Select One Of The Following: Content,Image,Icon')
+            break
+    }
+
+    return (
+        <Avatar {...attributes} {...propsToUse} />
+    );
+};
+
+export default AntdAvatar;

src/Components/badge/badge.jsx

@@ -8,15 +8,25 @@ const AntdBadge = props => {
   const [state, reload] = useDashboardEvent(props.id, props);
   const { content, attributes } = state;
 
+  const countProps = {
+    count: attributes.count,
+    showZero: attributes.showZero,
+    overflowCount: attributes.overflowCount,
+    style: attributes.style
+  }
+
+  const dotProps = {
+    color: attributes.color,
+    text: attributes.text,
+    status: attributes.status,
+    dot: attributes.dot
+  }
+
+  const propsToUse = attributes.count ? { ...countProps } : { ...dotProps }
   return (
-    <Badge {...attributes} count={attributes.count}>
-      {UniversalDashboard.renderComponent(content)}
-      <ReactInterval
-        callback={reload}
-        timeout={attributes.refreshInterval}
-        enabled={attributes.autoRefresh}
-      />
-    </Badge>
+    <Badge
+      {...propsToUse}
+      children={UniversalDashboard.renderComponent(content)} />
   );
 };
 

src/Components/button/button.jsx

@@ -17,7 +17,7 @@ const AntdButton = props => {
 
   return (
     <Button
-    {...attributes}
+      {...attributes}
       htmlType="button"
       type={attributes.buttonType}
       onClick={onClick}

src/Components/drawer/drawer.jsx

@@ -24,9 +24,8 @@ const AntdDrawer = props => {
       <Drawer
         {...attributes}
         onClose={onClose}
-      >
-        {UniversalDashboard.renderComponent(content)}
-      </Drawer>
+        children={UniversalDashboard.renderComponent(content)}
+      />
       <ReactInterval
         callback={reload}
         timeout={props.refreshInterval}

src/Components/index.js

@@ -33,6 +33,7 @@ import AntdRadio from "./radio/radio"
 import AntdRadioButton from "./radio/radio-button"
 import AntdRadioGroup from "./radio/radio-group"
 import AntdCopyToClipboard from "./copy-to-clipboard/copy-to-clipboard"
+import AntdAvatar from "./avatar/avatar"
 // const AntdCollapsed = lazy(() =>
 //   import(/* webpackChunkName: "AntdCollapsed" */ "./Utils/collapse")
 // ); - Still in development
@@ -72,4 +73,5 @@ UniversalDashboard.register("ud-antd-radio", AntdRadio);
 UniversalDashboard.register("ud-antd-radio-button", AntdRadioButton);
 UniversalDashboard.register("ud-antd-radio-group", AntdRadioGroup);
 UniversalDashboard.register("ud-antd-copy-button", AntdCopyToClipboard);
+UniversalDashboard.register("ud-antd-avatar", AntdAvatar);
 // UniversalDashboard.register("ud-antd-collapsed", AntdCollapsed); - Still in development

src/Scripts/New-UDAntdAutoCompete.ps1

@@ -101,10 +101,8 @@ function New-UDAntdAutoComplete {
             placeholder              = $placeholder
             value                    = $value
             onBlur                   = $onBlur
-            # onChange                 = $onChange
             onFocus                  = $onFocus
             onSearch                 = $onSearch
-            # onSelect                 = $onSelect
             defaultOpen              = $defaultOpen.IsPresent
             open                     = $open.IsPresent
             onDropdownVisibleChange  = $onDropdownVisibleChange

src/Scripts/New-UDAntdAvatar.ps1

@@ -0,0 +1,60 @@
+function New-UDAntdAvatar {
+    [CmdletBinding(DefaultParameterSetName = 'Icon')]
+    [OutputType('UDAntd.Avatar')]
+    Param(
+        [Parameter()]
+        [string]$Id = (New-Guid).ToString(),
+        [Parameter()]
+        [string]$ClassName,
+        [Parameter()]
+        [ValidateSet('circle', 'square')]
+        [string]$Shape,
+        [Parameter()]
+        [ValidateSet('small', 'default', 'large')]
+        [string]$Size,
+        [Parameter()]
+        [hashtable]$Style,
+        [Parameter()]
+        [scriptblock]$OnError,
+        [Parameter(ParameterSetName = 'Icon')]
+        [object]$Icon,
+        [Parameter(ParameterSetName = 'Image')]
+        [string]$Alt,
+        [Parameter(ParameterSetName = 'Image')]
+        [string]$Src,
+        [Parameter(ParameterSetName = 'Image')]
+        [string[]]$SrcSet,
+        [Parameter(ParameterSetName = 'Content')]
+        [object]$Content
+    )
+    End {
+        if ($null -ne $OnError) {
+            if ($OnError -is [scriptblock] -or $OnError -is [UniversalDashboard.Models.Endpoint]) {
+                $OnError = New-UDEndpoint -Endpoint $OnError -Id ($Id + "OnError")
+            }
+        }
+
+        if($PSCmdlet.ParameterSetName.Contains('Icon')){
+            $Content = $Icon
+        }
+
+        $UDAntdAvatar = @{
+            assetId     = $AssetId 
+            isPlugin    = $true 
+            type        = "ud-antd-avatar"
+            id          = $Id
+            className   = $ClassName
+            style        = $Style
+            size        = $Size
+            src         = $Src
+            srcSet      = $SrcSet
+            shape       = $Shape
+            alt         = $Alt
+            content     = $Content
+            parameterSet = $PSCmdlet.ParameterSetName
+            hasCallBack = $null -ne $OnError
+        }
+        $UDAntdAvatar.PSTypeNames.Insert(0, 'UDAntd.Avatar')
+        $UDAntdAvatar
+    }
+}

src/Scripts/New-UDAntdBadge.ps1

@@ -16,56 +16,58 @@
     General notes
 #>
 function New-UDAntdBadge {
+    [CmdletBinding(DefaultParameterSetName = 'Count')]
     param(
-        [Parameter()]
-        [string]$Id = (New-Guid).ToString(),
-        [Parameter()]
-        [string]$ClassName,
-        [Parameter()]
-        [ValidateSet('success', 'processing', 'default ', 'error', 'warning')]
+
+        [Parameter(ParameterSetName = 'Dot')]
+        [ValidateSet('success', 'processing', 'default', 'error', 'warning')]
         [string]$Status,
-        [Parameter()]
-        [string]$Title,
-        [Parameter()]
+
+        [Parameter(ParameterSetName = 'Dot')]
         [string]$Text,
-        [Parameter()]
-        [int]$OverflowCount,
-        [Parameter()]
-        [int[]]$OffSet,
-        [Parameter()]
-        [scriptblock]$Count,
-        [Parameter()]
-        [object]$Content,
-        [Parameter()]
+
+        [Parameter(ParameterSetName = 'Count')]
+        [int]$OverflowCount = 9999,
+
+        [Parameter(ParameterSetName = 'Count')]
+        [int]$Count,
+
+        [Parameter(ParameterSetName = 'Count')]
+        [hashtable]$Style,
+
+        [Parameter(ParameterSetName = 'Count')]
         [switch]$ShowZero,
-        [Parameter()]
+
+        [Parameter(ParameterSetName = 'Dot')]
         [switch]$Dot,
-        [Parameter(ParameterSetName = 'Color')]
+
+        [Parameter(ParameterSetName = 'Dot')]
         [string]$Color,
-        [Parameter(ParameterSetName = 'PresetColors')]
+
+        [Parameter(ParameterSetName = 'Dot')]
         [ValidateSet('pink', 'red', 'yellow', 'orange', 'cyan', 'green', 'blue', 'purple', 'geekblue', 'magenta', 'volcano', 'gold', 'lime')]
-        [string]$PresetColor,
+        [string]$PresetColor,  
+
         [Parameter()]
-        [hashtable]$Style,
+        [string]$Id = (New-Guid).ToString(),
         [Parameter()]
-        [int]$RefreshInterval = 5000,
+        [string]$ClassName,       
         [Parameter()]
-        [switch]$AutoRefresh,
+        [string]$Title,
         [Parameter()]
-        [switch]$IsEndpoint
-
+        [int[]]$OffSet,
+        [Parameter()]
+        [object]$Content
     )
 
     End {
 
-            if ($null -ne $Count -and $IsEndpoint) {
-                if ($Count -is [scriptblock]) {
-                    $Endpoint = New-UDEndpoint -Endpoint $Count -Id $Id 
-                }
-                elseif ($Count -isnot [UniversalDashboard.Models.Endpoint]) {
-                    throw "Count must be a script block or UDEndpoint"
-                }
-            }
+        if ($PSBoundParameters.ContainsKey('Color')) {
+            $SelectedColor = $Color
+        }
+        else {
+            $SelectedColor = $PresetColor
+        }
 
         @{
             assetId       = $AssetId 
@@ -77,17 +79,13 @@ function New-UDAntdBadge {
             showZero      = $ShowZero.IsPresent
             dot           = $Dot.IsPresent
             overflowCount = $OverflowCount
-            count         = $Count.Invoke()
+            count         = $Count
             status        = $Status
-            color         = $PresetColor
+            color         = $SelectedColor
             style         = $Style
             title         = $Title
-            text          = $Text
-            autoRefresh = $AutoRefresh.IsPresent
-            isEndpoint = $IsEndpoint.IsPresent
-            refreshInterval = $RefreshInterval
-            content = $Content
+            text          = $Text   
+            content       = $Content
         }
-
     }
 }

src/build.ps1

@@ -73,6 +73,7 @@ $manifestParameters = @{
         "New-UDAntdRadioButton"
         "New-UDAntdRadioGroup"
         "New-UDAntdCopyToClipboard"
+        "New-UDAntdAvatar"
     )
 }