jherve 1 год назад
Родитель
Сommit
04c37165d9

+ 6 - 6
src/LinkedIn/UI/Components/ArtDeco.purs

@@ -35,7 +35,7 @@ data ArtDecoCenterHeader a = ArtDecoCenterHeader {
 
 
 data ArtDecoCenterContent a = ArtDecoCenterContent (NonEmptyList (ArtDecoPvsEntitySubComponent a))
 data ArtDecoCenterContent a = ArtDecoCenterContent (NonEmptyList (ArtDecoPvsEntitySubComponent a))
 
 
-data ArtDecoPvsEntitySubComponent a = ArtDecoPvsEntitySubComponent (Maybe a)
+data ArtDecoPvsEntitySubComponent a = ArtDecoPvsEntitySubComponent a
 
 
 
 
 derive instance Generic (ArtDecoPvsEntitySubComponent a) _
 derive instance Generic (ArtDecoPvsEntitySubComponent a) _
@@ -45,21 +45,21 @@ instance Show a => Show (ArtDecoPvsEntitySubComponent a) where
 derive instance Functor ArtDecoPvsEntitySubComponent
 derive instance Functor ArtDecoPvsEntitySubComponent
 
 
 instance Foldable ArtDecoPvsEntitySubComponent where
 instance Foldable ArtDecoPvsEntitySubComponent where
-  foldMap f (ArtDecoPvsEntitySubComponent sc) = foldMap f sc
+  foldMap f (ArtDecoPvsEntitySubComponent sc) = f sc
 
 
   foldl = \x -> foldlDefault x
   foldl = \x -> foldlDefault x
   foldr = \x -> foldrDefault x
   foldr = \x -> foldrDefault x
 
 
 instance Traversable ArtDecoPvsEntitySubComponent where
 instance Traversable ArtDecoPvsEntitySubComponent where
   sequence (ArtDecoPvsEntitySubComponent subComponents) = ado
   sequence (ArtDecoPvsEntitySubComponent subComponents) = ado
-    sc <- sequence subComponents
+    sc <- subComponents
   in ArtDecoPvsEntitySubComponent sc
   in ArtDecoPvsEntitySubComponent sc
 
 
   traverse = \x -> traverseDefault x
   traverse = \x -> traverseDefault x
 
 
 instance Queryable q => CanBeQueried q ArtDecoPvsEntitySubComponent where
 instance Queryable q => CanBeQueried q ArtDecoPvsEntitySubComponent where
   query n = do
   query n = do
-    content <- ignoreNotFound $ queryOne "span[aria-hidden=true]" n
+    content <- queryOne "span[aria-hidden=true]" n
     pure $ ArtDecoPvsEntitySubComponent content
     pure $ ArtDecoPvsEntitySubComponent content
 
 
 derive instance Generic (ArtDecoCenterContent a) _
 derive instance Generic (ArtDecoCenterContent a) _
@@ -185,7 +185,7 @@ _header = lens' \(ArtDecoCenterHeader h) -> Tuple h \h' -> ArtDecoCenterHeader h
 _content :: forall a. Lens' (ArtDecoCenterContent a) (NonEmptyList (ArtDecoPvsEntitySubComponent a))
 _content :: forall a. Lens' (ArtDecoCenterContent a) (NonEmptyList (ArtDecoPvsEntitySubComponent a))
 _content = lens' \(ArtDecoCenterContent cs) -> Tuple cs \cs' -> ArtDecoCenterContent cs'
 _content = lens' \(ArtDecoCenterContent cs) -> Tuple cs \cs' -> ArtDecoCenterContent cs'
 
 
-_sub_component :: forall a. Lens' (ArtDecoPvsEntitySubComponent a) (Maybe a)
+_sub_component :: forall a. Lens' (ArtDecoPvsEntitySubComponent a) a
 _sub_component = lens' \(ArtDecoPvsEntitySubComponent s) -> Tuple s \s' -> ArtDecoPvsEntitySubComponent s'
 _sub_component = lens' \(ArtDecoPvsEntitySubComponent s) -> Tuple s \s' -> ArtDecoPvsEntitySubComponent s'
 
 
 _pvs_to_header :: forall a. Lens' (ArtDecoPvsEntity a) { bold ∷ a , light ∷ Maybe (NonEmptyList a) , normal ∷ Maybe a }
 _pvs_to_header :: forall a. Lens' (ArtDecoPvsEntity a) { bold ∷ a , light ∷ Maybe (NonEmptyList a) , normal ∷ Maybe a }
@@ -195,7 +195,7 @@ _pvs_to_header = _pvs_entity
   <<< prop (Proxy :: Proxy "header")
   <<< prop (Proxy :: Proxy "header")
   <<< _header
   <<< _header
 
 
-_pvs_to_subcomponents ∷ ∀ a. Traversal' (ArtDecoPvsEntity a) (Maybe a)
+_pvs_to_subcomponents ∷ ∀ a. Traversal' (ArtDecoPvsEntity a) a
 _pvs_to_subcomponents = _pvs_entity
 _pvs_to_subcomponents = _pvs_entity
   <<< prop (Proxy :: Proxy "center")
   <<< prop (Proxy :: Proxy "center")
   <<< _center
   <<< _center

+ 1 - 2
src/LinkedIn/UI/Components/ArtDecoCard.purs

@@ -7,7 +7,6 @@ import Data.Generic.Rep (class Generic)
 import Data.Lens (Lens', lens', toListOf, view)
 import Data.Lens (Lens', lens', toListOf, view)
 import Data.Lens.Record (prop)
 import Data.Lens.Record (prop)
 import Data.List (List)
 import Data.List (List)
-import Data.List as L
 import Data.List.Types (NonEmptyList)
 import Data.List.Types (NonEmptyList)
 import Data.Maybe (Maybe)
 import Data.Maybe (Maybe)
 import Data.Show.Generic (genericShow)
 import Data.Show.Generic (genericShow)
@@ -57,7 +56,7 @@ toHeaderLight ∷ ∀ a. ArtDecoCardElement a → Maybe (NonEmptyList a)
 toHeaderLight = view $ _card_to_pvs_entity <<< _pvs_to_header_light
 toHeaderLight = view $ _card_to_pvs_entity <<< _pvs_to_header_light
 
 
 toCenterContent ∷ ∀ a. ArtDecoCardElement a → List a
 toCenterContent ∷ ∀ a. ArtDecoCardElement a → List a
-toCenterContent c = L.catMaybes $ toContent c
+toCenterContent c = toContent c
   where
   where
     toContent = toListOf $ _card_to_pvs_entity <<< _pvs_to_subcomponents
     toContent = toListOf $ _card_to_pvs_entity <<< _pvs_to_subcomponents
 
 

+ 1 - 2
src/LinkedIn/UI/Components/ArtDecoTab.purs

@@ -7,7 +7,6 @@ import Data.Generic.Rep (class Generic)
 import Data.Lens (Lens', lens', toListOf, view)
 import Data.Lens (Lens', lens', toListOf, view)
 import Data.Lens.Record (prop)
 import Data.Lens.Record (prop)
 import Data.List (List)
 import Data.List (List)
-import Data.List as L
 import Data.List.Types (NonEmptyList)
 import Data.List.Types (NonEmptyList)
 import Data.Maybe (Maybe)
 import Data.Maybe (Maybe)
 import Data.Show.Generic (genericShow)
 import Data.Show.Generic (genericShow)
@@ -57,7 +56,7 @@ toHeaderLight ∷ ∀ a. ArtDecoTabElement a → Maybe (NonEmptyList a)
 toHeaderLight = view $ _tab_to_pvs_entity <<< _pvs_to_header_light
 toHeaderLight = view $ _tab_to_pvs_entity <<< _pvs_to_header_light
 
 
 toCenterContent ∷ ∀ a. ArtDecoTabElement a → List a
 toCenterContent ∷ ∀ a. ArtDecoTabElement a → List a
-toCenterContent c = L.catMaybes $ toContent c
+toCenterContent c = toContent c
   where
   where
     toContent = toListOf $ _tab_to_pvs_entity <<< _pvs_to_subcomponents
     toContent = toListOf $ _tab_to_pvs_entity <<< _pvs_to_subcomponents
 
 

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
test/ArtDecoCard.purs