From 0476a294d60a0c688d82af521650166a5fc1ae96 Mon Sep 17 00:00:00 2001
From: Eric NGUYEN <enguyen@techform.fr>
Date: Fri, 16 Sep 2022 16:23:17 +0200
Subject: [PATCH] Implement Category list

---
 src/Components/Category/Category.tsx | 54 +++++++++-------------------
 src/Components/Editor/Editor.tsx     |  1 +
 src/Components/Sidebar/Sidebar.tsx   | 31 ++++++++++------
 src/Components/UI/UI.tsx             |  3 ++
 src/Interfaces/ICategory.ts          |  5 +++
 src/Interfaces/IConfiguration.ts     |  2 ++
 test-server/http.js                  | 16 +++++++--
 7 files changed, 61 insertions(+), 51 deletions(-)
 create mode 100644 src/Interfaces/ICategory.ts

diff --git a/src/Components/Category/Category.tsx b/src/Components/Category/Category.tsx
index 2b30935..c8cdafa 100644
--- a/src/Components/Category/Category.tsx
+++ b/src/Components/Category/Category.tsx
@@ -1,58 +1,38 @@
 import { ChevronRightIcon } from '@heroicons/react/outline';
 import React, { useState } from 'react';
+import { ICategory } from '../../Interfaces/ICategory';
 import { TruncateString } from '../../utils/stringtools';
 
 interface ICategoryProps {
   children: JSX.Element | JSX.Element[]
-  category: string
+  category: ICategory
 }
 
 export function Category(props: ICategoryProps): JSX.Element {
   const [isOpen, setIsOpen] = useState(false);
 
-  if (isOpen) {
-    return (
-      <div
-        className='overflow-hidden h-full transition-all text-center cursor-pointer'
-        key={props.category}
-        id={props.category}
-        title={props.category}
-      >
-        <div
-          className='flex flex-row group full'
-          onClick={() => setIsOpen(!isOpen)}
-        >
-          <span className={'transition-all flex-1 h-full justify-center sidebar-component-left rounded-b-none bg-slate-400/80 group-hover:bg-blue-600'}>
-            {TruncateString(props.category, 25)}
-          </span>
-          <span className={'flex-none h-full justify-center sidebar-component-right rounded-b-none'}>
-            <ChevronRightIcon className='transition-all w-5 rotate-90' />
-          </span>
-        </div>
-        <div className='transition-all grid gap-2 p-2 bg-slate-400/80 overflow-auto rounded-b-lg visible'>
-          { props.children }
-        </div>
-      </div>
-    );
-  }
+  const categoryType: string = props.category.Type;
+  const categoryDisplayedText: string = props.category.DisplayedText ?? categoryType;
 
   return (
     <div
-      className='overflow-visible h-16 group transition-all text-center cursor-pointer'
-      key={props.category}
-      id={props.category}
-      title={props.category}
-      onClick={() => setIsOpen(!isOpen)}
+      className={` transition-all text-center ${isOpen ? 'overflow-hidden h-full' : 'overflow-visible h-16'}`}
+      key={categoryType}
+      id={categoryType}
+      title={categoryDisplayedText}
     >
-      <div className='flex flex-row h-full'>
-        <span className='flex-1 h-full justify-center sidebar-component-left'>
-          {TruncateString(props.category, 25)}
+      <div
+        className='flex flex-row group cursor-pointer h-16'
+        onClick={() => setIsOpen(!isOpen)}
+      >
+        <span className={`transition-all flex-1 h-full justify-center sidebar-component-left ${isOpen ? 'rounded-b-none bg-slate-400/80 group-hover:bg-blue-600' : ''}`}>
+          {TruncateString(categoryDisplayedText, 25)}
         </span>
-        <span className='flex-none h-full justify-center sidebar-component-right'>
-          <ChevronRightIcon className='transition-all w-5' />
+        <span className={`flex-none h-full justify-center sidebar-component-right ${isOpen ? 'rounded-b-none' : ''}`}>
+          <ChevronRightIcon className={`transition-all w-5 ${isOpen ? 'rotate-90' : ''}`} />
         </span>
       </div>
-      <div className='transition-all overflow-hidden rounded-b-lg hidden'>
+      <div className={`transition-all grid gap-2 p-2 rounded-b-lg ${isOpen ? 'visible overflow-auto bg-slate-400/80' : 'hidden overflow-hidden'}`}>
         { props.children }
       </div>
     </div>
diff --git a/src/Components/Editor/Editor.tsx b/src/Components/Editor/Editor.tsx
index 6411fa3..239f0ce 100644
--- a/src/Components/Editor/Editor.tsx
+++ b/src/Components/Editor/Editor.tsx
@@ -210,6 +210,7 @@ export function Editor(props: IEditorProps): JSX.Element {
         historyCurrentStep={historyCurrentStep}
         availableContainers={configuration.AvailableContainers}
         availableSymbols={configuration.AvailableSymbols}
+        categories={configuration.Categories}
         selectContainer={(container) => setNewHistory(
           SelectContainer(
             container,
diff --git a/src/Components/Sidebar/Sidebar.tsx b/src/Components/Sidebar/Sidebar.tsx
index cf695de..ac2f7a4 100644
--- a/src/Components/Sidebar/Sidebar.tsx
+++ b/src/Components/Sidebar/Sidebar.tsx
@@ -1,10 +1,12 @@
 import * as React from 'react';
 import { IAvailableContainer } from '../../Interfaces/IAvailableContainer';
+import { ICategory } from '../../Interfaces/ICategory';
 import { TruncateString } from '../../utils/stringtools';
 import { Category } from '../Category/Category';
 
 interface ISidebarProps {
   componentOptions: IAvailableContainer[]
+  categories: ICategory[]
   isOpen: boolean
   buttonOnClick: (type: string) => void
 }
@@ -15,7 +17,12 @@ function HandleDragStart(event: React.DragEvent<HTMLButtonElement>): void {
 
 export function Sidebar(props: ISidebarProps): JSX.Element {
   const rootElements: Array<JSX.Element | undefined> = [];
-  const categories = new Map<string, JSX.Element[]>();
+  const categories = new Map<string, ICategory>();
+  const categoriesElements = new Map<string, JSX.Element[]>(props.categories.map(category => {
+    categories.set(category.Type, category);
+    return [category.Type, []];
+  }));
+
   // build the components
   props.componentOptions.forEach(componentOption => {
     if (componentOption.IsHidden === true) {
@@ -39,25 +46,27 @@ export function Sidebar(props: ISidebarProps): JSX.Element {
       return;
     }
 
-    if (categories.get(componentOption.Category) === undefined) {
-      categories.set(componentOption.Category, []);
-    }
-
-    const category = categories.get(componentOption.Category);
-
+    const category = categoriesElements.get(componentOption.Category);
     if (category === undefined) {
-      // should never go here
+      console.error(`[Category] Category does not exists in configuration.Categories: ${componentOption.Category}`);
       return;
     }
-
     category.push(componentButton);
   });
 
   // build the categories
-  categories.forEach((options, category) => {
+  categoriesElements.forEach((options, categoryName) => {
+    const category = categories.get(categoryName);
+
+    if (category === undefined) {
+      // should never go here
+      console.error(`[Category] Category does not exists in configuration.Categories: ${categoryName}`);
+      return;
+    }
+
     rootElements.unshift(
       <Category
-        key={category}
+        key={categoryName}
         category={category}
       >
         { options }
diff --git a/src/Components/UI/UI.tsx b/src/Components/UI/UI.tsx
index 3561453..702ced8 100644
--- a/src/Components/UI/UI.tsx
+++ b/src/Components/UI/UI.tsx
@@ -13,6 +13,7 @@ import { Symbols } from '../Symbols/Symbols';
 import { SymbolsSidebar } from '../SymbolsSidebar/SymbolsSidebar';
 import { PropertyType } from '../../Enums/PropertyType';
 import { MessagesSidebar } from '../MessagesSidebar/MessagesSidebar';
+import { ICategory } from '../../Interfaces/ICategory';
 
 interface IUIProps {
   selectedContainer: IContainerModel | undefined
@@ -21,6 +22,7 @@ interface IUIProps {
   historyCurrentStep: number
   availableContainers: IAvailableContainer[]
   availableSymbols: IAvailableSymbol[]
+  categories: ICategory[]
   selectContainer: (containerId: string) => void
   deleteContainer: (containerId: string) => void
   onPropertyChange: (key: string, value: string | number | boolean, type?: PropertyType) => void
@@ -83,6 +85,7 @@ export function UI(props: IUIProps): JSX.Element {
 
       <Sidebar
         componentOptions={props.availableContainers}
+        categories={props.categories}
         isOpen={isSidebarOpen}
         buttonOnClick={props.addContainer} />
       <Symbols
diff --git a/src/Interfaces/ICategory.ts b/src/Interfaces/ICategory.ts
new file mode 100644
index 0000000..a4eac2b
--- /dev/null
+++ b/src/Interfaces/ICategory.ts
@@ -0,0 +1,5 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+export interface ICategory {
+  Type: string
+  DisplayedText?: string
+}
diff --git a/src/Interfaces/IConfiguration.ts b/src/Interfaces/IConfiguration.ts
index d3b98bc..98e0eea 100644
--- a/src/Interfaces/IConfiguration.ts
+++ b/src/Interfaces/IConfiguration.ts
@@ -1,12 +1,14 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { IAvailableContainer } from './IAvailableContainer';
 import { IAvailableSymbol } from './IAvailableSymbol';
+import { ICategory } from './ICategory';
 import { IPattern } from './IPattern';
 
 /** Model of configuration for the application to configure it */
 export interface IConfiguration {
   AvailableContainers: IAvailableContainer[] // TODO: Use a Map<string, IAvailableContainer>
   AvailableSymbols: IAvailableSymbol[] // TODO: Use a Map<string, IAvailableContainer>
+  Categories: ICategory[]
   Patterns: IPattern[]
   MainContainer: IAvailableContainer
 }
diff --git a/test-server/http.js b/test-server/http.js
index a729545..c170204 100644
--- a/test-server/http.js
+++ b/test-server/http.js
@@ -77,7 +77,7 @@ const GetSVGLayoutConfiguration = () => {
         },
         ShowSelfDimensions: true,
         IsDimensionBorrower: true,
-        Category: "Category"
+        Category: "Stuff"
       },
       {
         Type: 'Trou',
@@ -96,11 +96,11 @@ const GetSVGLayoutConfiguration = () => {
           stroke: 'green',
           fill: 'white'
         },
-        Category: "Category"
+        Category: "Stuff"
       },
       {
         Type: 'Remplissage',
-        Category: "Category2",
+        Category: "Other stuff",
         CustomSVG: `
           <rect width="{width}" height="{height}" style="{style}"></rect>
           <rect  width="{width}" height="{height}" stroke="black" fill-opacity="0"></rect>
@@ -204,6 +204,16 @@ const GetSVGLayoutConfiguration = () => {
         XPositionReference: 0
       }
     ],
+    Categories: [
+      {
+        Type: "Stuff",
+        DisplayedText: "Stuff made here"
+      },
+      {
+        Type: "Other stuff",
+        DisplayedText: "Stuff not made here"
+      }
+    ],
     MainContainer: {
       Height: 200,
       Width: 800