[TEMPLATE] Template.Simple needs additional testing and improvments

docfx/framework/toc.yml

@@ -6,4 +6,7 @@ items:
   - name: Inspectors
     href: ../inspectors/docs/index.html
   - name: Timers
-    href: ../timers/docs/index.html
+    href: ../timers/docs/index.html  
+  - name: Application Template
+    href: ../templates.simple/docs/index.html
+

src/base/src/AXOpen.Logging/AXOpen.Logging.Serilog.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-
+  <PropertyGroup>	
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/base/src/AXOpen.VisualComposer/AXOpen.VisualComposer.csproj

@@ -17,6 +17,7 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\..\..\data\src\AXOpen.Data.Blazor\axopen_data_blazor.csproj" />
+	  <ProjectReference Include="..\..\..\toolbox\src\AXOpen.ToolBox\AXOpen.ToolBox.csproj" />
 	</ItemGroup>
 
 </Project>

src/base/src/AXOpen.VisualComposer/AXOpen.VisualComposer.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "AXOpen.VisualComposer.csproj", "{691CAEAB-2761-415E-971F-39C4F48C175F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{691CAEAB-2761-415E-971F-39C4F48C175F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{691CAEAB-2761-415E-971F-39C4F48C175F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{691CAEAB-2761-415E-971F-39C4F48C175F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{691CAEAB-2761-415E-971F-39C4F48C175F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0A82BB85-D037-40A6-B4B4-0821E6B304DF}
+	EndGlobalSection
+EndGlobal

src/base/src/AXOpen.VisualComposer/AccordionComponent.razor

@@ -0,0 +1,41 @@
+@using AXSharp.Connector;
+
+<div class="accordion-item">
+    <div class="accordion-header">
+        <div class="input-group flex-nowrap">
+            <button class="accordion-button collapsed py-2" type="button" data-bs-toggle="collapse" data-bs-target="#@AccordionContent.HumanReadable.Replace('.', '_')" aria-expanded="false" aria-controls="@AccordionContent.HumanReadable.Replace('.', '_')">
+                @AccordionContent.HumanReadable
+            </button>
+            <a class="text-decoration-none text-black p-2 align-self-center" style="cursor: pointer;" @onclick="() => Parent.AddChildren(AccordionContent)"><span class="bi bi-plus-lg" aria-hidden="true" /></a>
+        </div>
+    </div>
+    <div id="@AccordionContent.HumanReadable.Replace('.', '_')" class="accordion-collapse collapse">
+        <div class="accordion-body">
+            <ul class="list-group">
+                @foreach (var item in AccordionContent.GetChildren())
+                {
+                    @if (!item.GetChildren().Any())
+                    {
+                        <li class="list-group-item d-flex">
+                            <p class="mb-0">@item.HumanReadable</p>
+                            <a class="ms-auto text-decoration-none text-black" style="cursor: pointer;" @onclick="() => Parent.AddChildren(item)"><span class="bi bi-plus-lg" aria-hidden="true" /></a>
+                        </li>
+                    }
+                    else
+                    {
+                        <AccordionComponent AccordionContent="item" Parent="@Parent" />
+                    }
+                }
+            </ul>
+        </div>
+    </div>
+</div>
+
+
+@code {
+    [Parameter]
+    public ITwinObject AccordionContent { get; set; }
+
+    [Parameter]
+    public VisualComposerContainer Parent { get; set; }
+}

src/base/src/AXOpen.VisualComposer/Serializing/SerializableVisualComposerItem.cs

@@ -2,12 +2,11 @@
 {
     internal class SerializableVisualComposerItem
     {
-        public SerializableVisualComposerItem(string id, double ratioImgX, double ratioImgY, bool show, string transform, string presentation, double width, double height, int zIndex)
+        public SerializableVisualComposerItem(string id, double ratioImgX, double ratioImgY, string transform, string presentation, double width, double height, int zIndex)
         {
             Id = id;
             RatioImgX = ratioImgX;
             RatioImgY = ratioImgY;
-            Show = show;
             Transform = transform;
             Presentation = presentation;
             Width = width;
@@ -18,7 +17,6 @@ public SerializableVisualComposerItem(string id, double ratioImgX, double ratioI
         public string Id { get; set; }
         public double RatioImgX { get; set; } = 10;
         public double RatioImgY { get; set; } = 10;
-        public bool Show { get; set; } = false;
         public string Transform { get; set; } = "TopCenter";
         public string Presentation { get; set; } = "Status-Display";
         public double Width { get; set; } = -1;

src/base/src/AXOpen.VisualComposer/Serializing/Serialize.cs

@@ -2,9 +2,9 @@
 
 namespace AXOpen.VisualComposer.Serializing
 {
-    internal static class Serializing
+    internal static class Serializing<T>
     {
-        internal static void Serialize(string filePath, List<SerializableVisualComposerItem> serialize)
+        internal static void Serialize(string filePath, List<T> serialize)
         {
             try
             {
@@ -19,17 +19,17 @@ internal static void Serialize(string filePath, List<SerializableVisualComposerI
             }
         }
 
-        internal static List<SerializableVisualComposerItem>? Deserialize(string filePath)
+        internal static List<T>? Deserialize(string filePath)
         {
             if (!File.Exists(filePath))
                 return null;
 
-            List<SerializableVisualComposerItem>? deserialize = null;
+            List<T>? deserialize = null;
             try
             {
                 using (FileStream fs = File.OpenRead(filePath))
                 {
-                    deserialize = JsonSerializer.Deserialize<List<SerializableVisualComposerItem>>(fs);
+                    deserialize = JsonSerializer.Deserialize<List<T>>(fs);
                 }
             }
             catch (Exception ex)

src/base/src/AXOpen.VisualComposer/VisualComposerContainer.razor

@@ -1,15 +1,39 @@
-<AuthorizeView Roles="Administrator">
+@using AXSharp.Connector;
+
+<AuthorizeView Roles="Administrator">
     <Authorized>
         <div style="position: relative; width: 100%; height: 100%;" ondragover="event.preventDefault();">
             <img id="@_imgId" src="@ImgSrc" style="width: 100%; height: 100%; object-fit: cover;" />
             <CascadingValue Value="@this" Name="Parent" IsFixed="true">
                 <CascadingValue Value="@_imgId" Name="ImgId" IsFixed="true">
-                    @ChildContent
+                    @foreach (VisualComposerItem child in _children)
+                    {
+                        <VisualComposerItem Origin="@child" />
+                    }
                 </CascadingValue>
             </CascadingValue>
 
-            <button type="button" class="btn btn-primary" @onclick="Save">Save</button>
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#showAllModal-@Id">Show all</button>
+            <div class="dropdown">
+                <a class="position-absolute dropdown-toggle text-decoration-none text-black" style="left: 97%; top: 100%; translate: -100% -50%; cursor: pointer;" data-bs-toggle="dropdown" aria-expanded="false">
+                    <span class="bi bi-pencil-square fs-4" aria-hidden="true" />
+                </a>
+                <ul class="dropdown-menu">
+                    <li><a class="dropdown-item" data-bs-toggle="modal" data-bs-target="#showAllModal-@Id">Show all</a></li>
+                    <li><a class="dropdown-item" data-bs-toggle="modal" data-bs-target="#showAllPrimitivesModal-@Id">Show all primitives</a></li>
+                    <li><a class="dropdown-item" @onclick="() => Save()">Save as default</a></li>
+                    <li><a class="dropdown-item" data-bs-toggle="modal" data-bs-target="#saveAsModal-@Id">Save as</a></li>
+                    <li><a class="dropdown-item" data-bs-toggle="modal" data-bs-target="#removeModal-@Id">Remove</a></li>
+                </ul>
+            </div>
+
+            <div class="position-absolute" style="left: 90%; top: 100%; translate: -100% -50%;">
+                <select class="form-select w-auto" @onchange="(ChangeEventArgs args) => Load(args.Value.ToString())">
+                    @foreach (var item in GetAllFiles())
+                    {
+                        <option value="@item" selected="@((item == "Default") ? "selected" : null)">@item</option>
+                    }
+                </select>
+            </div>
         </div>
 
         <div class="modal fade" id="showAllModal-@Id" tabindex="-1" aria-hidden="true">
@@ -20,34 +44,123 @@
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     </div>
                     <div class="modal-body justify-content-center">
-                        <div class="row align-items-center">
-                            <p class="col-8 text-end">Name</p>
-                            <p class="col-4">Show</p>
+                        <div class="row mb-2">
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control" placeholder="Search" @bind="SearchValue">
+                            </div>
+                            <button type="button" class="btn btn-primary col-sm me-3" @onclick="() => Search()">Search</button>
                         </div>
-                        @foreach (var child in _children)
+
+                        @if (SearchValue is null || SearchResult is null)
                         {
-                            <div class="row align-items-center">
-                                <label class="form-check-label col-8 text-end" for="@(child.Id)">@child.Id</label>
-                                <input class="form-check-input col-4 ms-1" type="checkbox" id="@(child.Id)" checked="@(child.Show ? "checked" : null)" @onclick="() => Check(child)">
-                                @*<div class="col-2 ms-1 d-inline-block">
-                                    <input type="text" class="form-control" placeholder="Presentation" @bind="child.Presentation">
-                                    <select class="form-select" value="@child.Presentation.ToString()" @onchange="@((args) => @child.Presentation = PresentationType.FromString((string)args.Value))">
-                                        @foreach (var presentation in PresentationType.AllTypes)
-                                        {
-                                            <option data value="@presentation.ToString()">@presentation.ToString()</option>
-                                        }
-                                    </select>
-                                </div>
-                                <div class="col-2 ms-1 d-inline-block">
-                                    <select class="form-select" value="@child.Transform.ToString()" @onchange="@((args) => @child.Transform = TransformType.FromString((string)args.Value))">
-                                        @foreach (var transform in TransformType.AllTypes)
-                                        {
-                                            <option data value="@transform.ToString()">@transform.ToString()</option>
-                                        }
-                                    </select>
-                                </div>*@
+                            <div class="accordion" id="accordionExample">
+                                @foreach (var item in AxoObject.GetChildren())
+                                {
+                                    <AccordionComponent AccordionContent="@item" Parent="@this" />
+                                }
                             </div>
                         }
+                        else
+                        {
+                            <ul class="list-group">
+                                @foreach (var item in SearchResult)
+                                {
+                                    <li class="list-group-item d-flex">
+                                        <p class="mb-0">@item.HumanReadable</p>
+                                        <a class="ms-auto text-decoration-none text-black" style="cursor: pointer;" @onclick="() => AddChildren(item)"><span class="bi bi-plus-lg" aria-hidden="true" /></a>
+                                    </li>
+                                }
+                            </ul>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="modal fade" id="showAllPrimitivesModal-@Id" tabindex="-1" aria-hidden="true">
+            <div class="modal-dialog modal-xl modal-dialog-centered modal-dialog-scrollable">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h1 class="modal-title fs-5" id="alarmsviewTitle">All primitives</h1>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body justify-content-center">
+                        <div class="row mb-2">
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control" placeholder="Search" @bind="SearchValuePrimitive">
+                            </div>
+                            <button type="button" class="btn btn-primary col-sm me-3" @onclick="() => SearchPrimitive()">Search</button>
+                        </div>
+
+                        @if (SearchValuePrimitive is null || SearchResultPrimitive is null)
+                        {
+                            <ul class="list-group">
+                                @foreach (var item in AxoObject.RetrievePrimitives())
+                                {
+                                    <li class="list-group-item d-flex">
+                                        <p class="mb-0">@item.HumanReadable</p>
+                                        <a class="ms-auto text-decoration-none text-black" style="cursor: pointer;" @onclick="() => AddChildren(item)"><span class="bi bi-plus-lg" aria-hidden="true" /></a>
+                                    </li>
+                                }
+                            </ul>
+                        }
+                        else
+                        {
+                            <ul class="list-group">
+                                @foreach (var item in SearchResultPrimitive)
+                                {
+                                    <li class="list-group-item d-flex">
+                                        <p class="mb-0">@item.HumanReadable</p>
+                                        <a class="ms-auto text-decoration-none text-black" style="cursor: pointer;" @onclick="() => AddChildren(item)"><span class="bi bi-plus-lg" aria-hidden="true" /></a>
+                                    </li>
+                                }
+                            </ul>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="modal fade" id="saveAsModal-@Id" tabindex="-1" aria-hidden="true">
+            <div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h1 class="modal-title fs-5" id="alarmsviewTitle">Save as</h1>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body justify-content-center">
+                        <div class="row">
+                            <label class="col-sm-2 col-form-label">File name</label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control" placeholder="File name" @bind="FileName">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                        <button type="button" class="btn btn-primary" data-bs-dismiss="modal" @onclick="() => Save(FileName)">Save</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="modal fade" id="removeModal-@Id" tabindex="-1" aria-hidden="true">
+            <div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h1 class="modal-title fs-5" id="alarmsviewTitle">Remove template</h1>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body justify-content-center">
+                        <ul class="list-group">
+                            @foreach (var item in GetAllFiles())
+                            {
+                                <li class="list-group-item d-flex">
+                                    <p class="mb-0">@item</p>
+                                    <a class="ms-auto text-decoration-none text-black" style="cursor: pointer;" @onclick="() => Remove(item)"><span class="bi bi-trash fs-5" aria-hidden="true" /></a>
+                                </li>
+                            }
+                        </ul>
                     </div>
                 </div>
             </div>
@@ -58,7 +171,10 @@
             <img id="@_imgId" src="@ImgSrc" style="width: 100%; height: 100%; object-fit: cover;" />
             <CascadingValue Value="@this" Name="Parent" IsFixed="true">
                 <CascadingValue Value="@_imgId" Name="ImgId" IsFixed="true">
-                    @ChildContent
+                    @foreach (VisualComposerItem child in _children)
+                    {
+                        <VisualComposerItem Origin="@child" />
+                    }
                 </CascadingValue>
             </CascadingValue>
         </div>