Add enduser filter

ui/webapp/src/data.ts

@@ -163,6 +163,10 @@ export const COMMON_FILTERS: FilterSection[] = [
         value: 'specification',
         name: 'Specification',
       },
+      {
+        value: 'enduser',
+        name: 'End user',
+      },
     ],
   },
 ];

ui/webapp/src/layout/explore/index.tsx

@@ -63,7 +63,7 @@ interface Props {
 const TITLE_GAP = 40;
 const CONTROLS_WIDTH = 102 + 49 + 160 + 101 + 24 + 32; // Filters + Group legend + View Mode + Zoom + Right margin + Loading
 const CONTROLS_CARD_WIDTH = CONTROLS_WIDTH + 0 + 435 - 101; // + Classify/Sort - Zoom
-const EXTRA_FILTERS = ['specification'];
+const EXTRA_FILTERS = ['specification', 'enduser'];
 const DELAY_ACTIONS = 40;
 
 const Explore = (props: Props) => {

ui/webapp/src/layout/logos/index.tsx

@@ -75,10 +75,6 @@ const Logos = () => {
                 list = itemsDataGetter.getItemsByEndUser() || [];
                 break;
 
-              case 'allenduser':
-                list = itemsDataGetter.getAllEndUserItems() || [];
-                break;
-
               default:
                 break;
             }

ui/webapp/src/utils/filterData.ts

@@ -14,6 +14,10 @@ const filterData = (items: Item[], activeFilters: ActiveFilters): Item[] => {
         ) {
           return false;
         }
+
+        if (activeFilters[FilterCategory.Extra].includes('enduser') && (isUndefined(item.enduser) || !item.enduser)) {
+          return false;
+        }
       }
 
       // Filter Category

ui/webapp/src/utils/itemsDataGetter.ts

@@ -584,16 +584,6 @@ export class ItemsDataGetter {
     }
   }
 
-  // Get all end users
-  public getAllEndUserItems(): Item[] | undefined {
-    if (this.ready && this.landscapeData && this.landscapeData.items) {
-      return this.landscapeData.items.filter(
-        (i: Item) =>
-          (i.enduser && window.baseDS.members_category === i.category) || i.subcategory === 'End User Supporter'
-      );
-    }
-  }
-
   // Get maturity options
   public getMaturityOptions(): string[] {
     const maturity = window.baseDS.items.map((i: Item) => i.maturity);
@@ -704,10 +694,6 @@ export class ItemsDataGetter {
             value: 'enduser',
             name: 'End user members',
           },
-          {
-            value: 'allenduser',
-            name: 'All end users',
-          },
         ],
       });
     }

ui/webapp/src/utils/prepareFilters.ts

@@ -61,6 +61,10 @@ const prepareFilters = (items: Item[], group: string): FilterSection[] => {
       extraTypes.push('specification');
     }
 
+    if (i.enduser) {
+      extraTypes.push('enduser');
+    }
+
     if (i.category && checkIfCategoryInGroup(i.category, group)) {
       categories.push(i.category);
     }
@@ -193,15 +197,23 @@ const prepareFilters = (items: Item[], group: string): FilterSection[] => {
     }
 
     if (extraTypes.length > 0) {
+      const options = [];
+      if (extraTypes.includes('enduser')) {
+        options.push({
+          value: 'enduser',
+          name: 'End user',
+        });
+      }
+      if (extraTypes.includes('specification')) {
+        options.push({
+          value: 'specification',
+          name: 'Specification',
+        });
+      }
       filters.push({
         value: FilterCategory.Extra,
         title: 'Extra',
-        options: [
-          {
-            value: 'specification',
-            name: 'Specification',
-          },
-        ],
+        options: options,
       });
     }
   }