From 1670c8e50558284761002b927f38f89475fdb13b Mon Sep 17 00:00:00 2001
From: Yegor Vialov <vyalov.egor@gmail.com>
Date: Thu, 7 May 2020 16:14:23 +0000
Subject: [PATCH] Hide unsupported cards

---
 lib/cards/card.class.dart       | 17 +++++++++--------
 lib/cards/unsupported_card.dart |  7 +------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/cards/card.class.dart b/lib/cards/card.class.dart
index 74f969f..67743e6 100644
--- a/lib/cards/card.class.dart
+++ b/lib/cards/card.class.dart
@@ -13,6 +13,11 @@ class CardData {
 
   factory CardData.parse(rawData) {
     try {
+      if (rawData['type'] == null) {
+        rawData['type'] = CardType.ENTITIES;
+      } else if (!(rawData['type'] is String)) {
+        return CardData(null);
+      }
       switch (rawData['type']) {
           case CardType.ENTITIES:
             return EntitiesCardData(rawData);
@@ -56,14 +61,10 @@ class CardData {
           case CardType.MEDIA_CONTROL:
             return MediaControlCardData(rawData);
             break;
+          //TODO make all other official Lovelace cards as Entities
+          //All other cards should be unsupported and not shown
           default:
-            if (rawData.containsKey('entities')) {
-              return EntitiesCardData(rawData);
-            } else if (rawData.containsKey('entity')) {
-              rawData['entities'] = [rawData['entity']];
-              return EntitiesCardData(rawData);
-            }
-            return CardData(rawData);
+            return CardData(null);
         }
     } catch (error, stacktrace) {
       Logger.e('Error parsing card $rawData: $error', stacktrace: stacktrace);
@@ -73,7 +74,7 @@ class CardData {
 
   CardData(rawData) {
     if (rawData != null && rawData is Map) {
-      type = rawData['type'] ?? CardType.ENTITIES;
+      type = rawData['type'];
       conditions = rawData['conditions'] ?? [];
       showEmpty = rawData['show_empty'] ?? true;
       stateFilter = rawData['state_filter'] ?? [];
diff --git a/lib/cards/unsupported_card.dart b/lib/cards/unsupported_card.dart
index 251e9c4..78bb604 100644
--- a/lib/cards/unsupported_card.dart
+++ b/lib/cards/unsupported_card.dart
@@ -7,11 +7,6 @@ class UnsupportedCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return CardWrapper(
-      child: Padding(
-        padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, Sizes.rowPadding),
-        child: Text("'${card.type}' card is not supported yet"),
-      )
-    );
+    return Container();
   }  
 }
\ No newline at end of file