wagtail-enap-designsystem 1.2.1.152__py3-none-any.whl → 1.2.1.153__py3-none-any.whl

enap_designsystem/blocks/html_blocks.py

@@ -533,17 +533,13 @@ class NewsCarouselBlock(BaseBlock):
         indexer = value["indexed_by"].specific
         num_posts = value["num_posts"]
         
-        # ========================================
-        # NOVA LÓGICA COM DESTAQUE FIXO
-        # ========================================
-        
         # Import dinâmico para evitar imports circulares
         try:
             from django.apps import apps
             ENAPNoticia = apps.get_model('enap_designsystem', 'ENAPNoticia')
         except (ImportError, LookupError):
-            # Se não encontrar a classe, usar lógica original
-            pages = indexer.get_children().live().order_by("-first_published_at")[:50]
+            # Se não encontrar a classe, usar lógica original OTIMIZADA
+            pages = indexer.get_children().live().select_related('content_type').order_by("-first_published_at")[:50]
             
             def get_page_date(page):
                 return getattr(page.specific, "date_display", None) or page.first_published_at.date()
@@ -552,31 +548,37 @@ class NewsCarouselBlock(BaseBlock):
             context["pages"] = pages_final
             return context
         
-        # Pegar todas as páginas filhas que são notícias
-        all_children = indexer.get_children().live()
+        
+        all_children = indexer.get_children().live().select_related('content_type')[:20]
         enap_noticias = []
         outras_pages = []
+        noticias_ids = set()  # Usar set para busca O(1)
         
         for page in all_children:
             if isinstance(page.specific, ENAPNoticia):
                 enap_noticias.append(page.specific)
+                noticias_ids.add(page.specific.id)
             else:
                 outras_pages.append(page)
         
-        # Se temos notícias ENAP, usar o sistema de destaque
-        if enap_noticias:
-            # Filtrar apenas as notícias que são filhas da página indexadora
-            noticias_ids = [noticia.id for noticia in enap_noticias]
-            
+
+        if enap_noticias:            
             # Ordenar TODAS as notícias por data primeiro
             def get_page_date(page):
                 return getattr(page, "date_display", None) or page.first_published_at.date()
             
             todas_noticias_ordenadas = sorted(enap_noticias, key=get_page_date, reverse=True)
             
-            # Pegar a notícia em destaque (se estiver entre as filhas)
-            destaque = ENAPNoticia.get_noticia_destaque()
-            if destaque and destaque.id in noticias_ids:
+            # Pegar a notícia em destaque (se estiver entre as filhas) COM PROTEÇÃO
+            destaque = None
+            try:
+                destaque_temp = ENAPNoticia.get_noticia_destaque()
+                if destaque_temp and destaque_temp.id in noticias_ids:
+                    destaque = destaque_temp
+            except Exception:
+                destaque = None
+                
+            if destaque:
                 # Remove o destaque da lista ordenada
                 noticias_sem_destaque = [n for n in todas_noticias_ordenadas if n.id != destaque.id]
                 
@@ -587,8 +589,7 @@ class NewsCarouselBlock(BaseBlock):
                 pages_final = todas_noticias_ordenadas[:num_posts]
         
         else:
-            # Não são notícias ENAP, usar lógica original
-            pages = indexer.get_children().live().order_by("-first_published_at")[:50]
+            pages = indexer.get_children().live().select_related('content_type').order_by("-first_published_at")[:50]
             
             def get_page_date(page):
                 return getattr(page.specific, "date_display", None) or page.first_published_at.date()

enap_designsystem/blocks/semana_blocks.py

@@ -1298,6 +1298,11 @@ class MenuNavigationBlock(blocks.StructBlock):
         help_text="Imagem de logo da esquerda"
     )
     
+    logo_url = blocks.URLBlock(
+        required=False,
+        help_text="Link ao clicar na logo"
+    )
+    
     cor_fundo = blocks.CharBlock(
         default='#132929',
         help_text="Cor de fundo do menu"

enap_designsystem/models.py

@@ -2212,7 +2212,7 @@ class EnapSearchElastic(Page):
 			# Caso 3: nenhum dos dois — define None ou imagem default
 			else:
 				if tipo == "noticias":
-					item["imagem"] = "/static/enap_designsystem/icons/thumb-noticias.png"
+					item["imagem"] = "/static/enap_designsystem/icons/thumb-noticias-novo.png"
 				else:
 					item["imagem"] = None  # ou: "/static/enap_designsystem/icons/280-140-default.png"
 
@@ -2254,7 +2254,7 @@ class EnapSearchElastic(Page):
 			"_url_filter": "url",
 			"_data_atualizacao_filter": "data_atualizacao",
 			"last_published_at_filter": "data_publicacao",
-			"enap_designsystem_enapnoticiaimportada__imagem_filter":"imagem"
+			"_imagem_filter":"imagem"
 		}
 
 		# Inicializa o dicionário resultante

enap_designsystem/templates/enap_designsystem/pages/page_search.html

@@ -63,37 +63,37 @@
             </div>
             <div class="tab">
                 <a class="tabbusca tab-btn {% if tipo == 'cursos' %}active{% endif %} tabcursos"
-                href="?q={{ query }}&tipo=cursos{% if ordenacao %}&ordenacao={{ ordenacao }}{% else %}&ordenacao=recentes{% endif %}">
+                href="?q={{ query }}&tipo=cursos&ordenacao=relevantes">
                     Cursos
                     <span class="tab-count">{{ tabs_totais.cursos }}</span>
                 </a>
 
                 <a class="tabbusca tab-btn {% if tipo == 'servicos' %}active{% endif %} tabservicos"
-                href="?q={{ query }}&tipo=servicos{% if ordenacao %}&ordenacao={{ ordenacao }}{% else %}&ordenacao=recentes{% endif %}">
+                href="?q={{ query }}&tipo=servicos&ordenacao=relevantes">
                     Serviços
                     <span class="tab-count">{{ tabs_totais.servicos }}</span>
                 </a>
 
                 <a class="tabbusca tab-btn {% if tipo == 'noticias' %}active{% endif %} tabnoticiais"
-                href="?q={{ query }}&tipo=noticias{% if ordenacao %}&ordenacao={{ ordenacao }}{% else %}&ordenacao=recentes{% endif %}">
+                href="?q={{ query }}&tipo=noticias&ordenacao=recentes">
                     Notícias
                     <span class="tab-count">{{ tabs_totais.noticias }}</span>
                 </a>
 
                 <a class="tabbusca tab-btn {% if tipo == 'eventos' %}active{% endif %} tabeventos"
-                href="?q={{ query }}&tipo=eventos{% if ordenacao %}&ordenacao={{ ordenacao }}{% else %}&ordenacao=recentes{% endif %}">
+                href="?q={{ query }}&tipo=eventos&ordenacao=recentes">
                     Eventos e Oficinas
                     <span class="tab-count">{{ tabs_totais.eventos }}</span>
                 </a>
 
                 <a class="tabbusca tab-btn {% if tipo == 'pesquisa_conhecimento' %}active{% endif %} tabpesquisa"
-                href="?q={{ query }}&tipo=pesquisa_conhecimento{% if ordenacao %}&ordenacao={{ ordenacao }}{% else %}&ordenacao=recentes{% endif %}">
+                href="?q={{ query }}&tipo=pesquisa_conhecimento&ordenacao=relevantes">
                     Pesquisa e Conhecimento
                     <span class="tab-count">{{ tabs_totais.pesquisa_conhecimento }}</span>
                 </a>
 
                 <a class="tabbusca tab-btn {% if tipo == 'todos' %}active{% endif %} tabtodos"
-                href="?q={{ query }}&tipo=todos{% if ordenacao %}&ordenacao={{ ordenacao }}{% else %}&ordenacao=recentes{% endif %}">
+                href="?q={{ query }}&tipo=todos&ordenacao=relevantes">
                     Todos
                     <span class="tab-count">{{ tabs_totais.todos }}</span>
                 </a>

enap_designsystem/templates/enap_designsystem/semana_inovacao/blocks_menu_navigation.html

@@ -15,7 +15,7 @@
     <div class="container-fluid_semana">
         <!-- Logo -->
         {% if value.logo %}
-            <a class="navbar-brand" href="/">
+            <a class="navbar-brand" href="{{ value.logo_url}}">
                 {% image value.logo original %}
             </a>
         {% endif %}

{wagtail_enap_designsystem-1.2.1.152.dist-info → wagtail_enap_designsystem-1.2.1.153.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagtail-enap-designsystem
-Version: 1.2.1.152
+Version: 1.2.1.153
 Summary: Módulo de componentes utilizado nos portais ENAP, desenvolvido com Wagtail + CodeRedCMS
 Author: Renan Campos
 Author-email: renan.oliveira@enap.gov.br

{wagtail_enap_designsystem-1.2.1.152.dist-info → wagtail_enap_designsystem-1.2.1.153.dist-info}/RECORD

@@ -1,7 +1,7 @@
 enap_designsystem/__init__.py,sha256=_SM5n--8zkHIEZfCoc7wEfm6hQT8cuATZSRlLdrD7Rg,68
 enap_designsystem/apps.py,sha256=psX3YlGfqmPsaZZzRL4cpDTGvjwfNJT_0Vvizc_LIEg,226
 enap_designsystem/context_processors.py,sha256=ooXzfb2EnzczH4H2M-uz__97u8yKHc3LOJUu0LfxREE,1475
-enap_designsystem/models.py,sha256=DOAtJPp3DhWEX062jxSgxUvt-QBh8FxRWWcZCG9dj2o,183014
+enap_designsystem/models.py,sha256=h_XLS4Er2nGxL8UvLOzoPd8oDsFX7xjfGAfwzMJ99xU,182980
 enap_designsystem/settings.py,sha256=gCkWCK4QZlD8i82G8v7aHhKz954KFkY6xdhKNw9CCpw,993
 enap_designsystem/signals.py,sha256=oaHpZms4Dkc97ql-55Q0QxU7-45jwg2Y1XoRDOJ45tc,1978
 enap_designsystem/urls.py,sha256=EJ52w-55BysQU5pTZR4ltMtZM7aSKyjZdnQDGFipDXY,2219
@@ -12,10 +12,10 @@ enap_designsystem/blocks/base_blocks.py,sha256=ZuqVWn4PEAvD3pKM1ST7wjo4lwv98ooen
 enap_designsystem/blocks/chatbot_blocks.py,sha256=YeCznrXMbFa9MP9vjdTYl53ZhKsywkGOXvFK2bwcqW0,1133
 enap_designsystem/blocks/content_blocks.py,sha256=HGUCTiQ12E__VDAz2L-OBFaX3PLf5zSx9x6cDEGtOss,16582
 enap_designsystem/blocks/form.py,sha256=oK0Lswd1nIH0bLTdBL_XF_1LbNPixEYr5FJWj8DAxHY,88782
-enap_designsystem/blocks/html_blocks.py,sha256=d-dPWPPdeejvs0rsuctWsc6l4ql1XNyTUcuFdqX7SYA,260769
+enap_designsystem/blocks/html_blocks.py,sha256=byqtpSGFFFxUjlnRA52cSzn3LXOGZ98ie4zyWztMbAU,260741
 enap_designsystem/blocks/layout_blocks.py,sha256=gKmpWPAcw_cXFb4m3lgKB1drhIUnGAnS7m_gmQXxLG0,24248
 enap_designsystem/blocks/security.py,sha256=QA7lmQ_eQ6iopunatl_DrHkEegAwMZJGwXunRulbCjk,2099
-enap_designsystem/blocks/semana_blocks.py,sha256=FyqtZuLf2hPNqryUe4CAcjmGUY-5812dFWxVQ1ohhiw,70836
+enap_designsystem/blocks/semana_blocks.py,sha256=A-IJwtu0aeEnefcJO31pn7xxXjBiOgVQjl97Iw6mAnE,70946
 enap_designsystem/blocks/semana_inovacao.py,sha256=ZKjXzvs_RbLzv3nxsnmVxcAWORlpFIr9C7_aMb8rZRs,47037
 enap_designsystem/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enap_designsystem/middleware/aluno_sso.py,sha256=baitPngI34eKwHKaku-5JIbDAnXpEHPvRFTs9AY1K6o,542
@@ -592,6 +592,7 @@ enap_designsystem/static/enap_designsystem/icons/logobranca.svg,sha256=U5Y_APE0b
 enap_designsystem/static/enap_designsystem/icons/png-transparent-wagtail-full-logo-tech-companies.png,sha256=Cfl8NFNdZKFZ9nCBwL4qjYW-rGpiEPXfeKgGSGXzGd4,9697
 enap_designsystem/static/enap_designsystem/icons/sss.png,sha256=lbhcvOkzcZw78OjIkiOagA1vzaPiLVgiwL_Nq-0Lm_A,1430556
 enap_designsystem/static/enap_designsystem/icons/ssssss.png,sha256=NE1ZqkHnPw9kYswlP1Dlt_xM5GEJmRahzoENwa1dNHQ,2847992
+enap_designsystem/static/enap_designsystem/icons/thumb-noticias-novo.png,sha256=UvxSbSAH4-UParJRo6efIH2y3R6tW0fCjhSsnvSRl-Y,328474
 enap_designsystem/static/enap_designsystem/icons/thumb-noticias.png,sha256=JHZqMZzvnG0v5HcVRhNUl771vFbX4vG6QDd8F0GBu44,3315
 enap_designsystem/static/enap_designsystem/icons/twitter.svg,sha256=9DjgekC0UbONjHczq9TAUIFrEnUxAc9IlzA2nXm1NB0,934
 enap_designsystem/static/enap_designsystem/icons/youtube.svg,sha256=-hM5o3lfTqEvQeIKIoB_Yl0aCJ732riAUJH4ucAgrAw,790
@@ -804,7 +805,7 @@ enap_designsystem/templates/enap_designsystem/pages/durante_evento.html,sha256=c
 enap_designsystem/templates/enap_designsystem/pages/enap_layout.html,sha256=JqS4oXQrNLQaPc4HMYRmZu8LlevuRUl_Hyf2d8XMugM,1961
 enap_designsystem/templates/enap_designsystem/pages/enap_layout_semana.html,sha256=nZV71dI5MiM2CC6vbcKAX2H0fuqBsz2jvSOwtODEluU,1969
 enap_designsystem/templates/enap_designsystem/pages/mba_especializacao.html,sha256=GwurtlZ6OsvRAz_LcBQ0zr9ez20tplyiDPTCtuMLGuM,6331
-enap_designsystem/templates/enap_designsystem/pages/page_search.html,sha256=vWK4j-8uZtacfk9YMk01Mylkpgao3H6JYf8C6FsjDow,50850
+enap_designsystem/templates/enap_designsystem/pages/page_search.html,sha256=i4trtyJGdxPPiWy0FzpQqv1Eo_Cs6BSxU4MMFOLS6rg,50468
 enap_designsystem/templates/enap_designsystem/pages/pagepreview_block.html,sha256=RBqtL0rphuSh5Bi4XPPtXlGUf_zyWFPZY3xwJb8hhZM,235
 enap_designsystem/templates/enap_designsystem/pages/pos_evento.html,sha256=BWRdoOJuTPWetwQeTfkygvpMVSMQqBG8QK_AbHKBqKw,3273
 enap_designsystem/templates/enap_designsystem/pages/pre_evento.html,sha256=aLLqMoW4cnu7NFZ57D5Lq3B_cwbHAPmp3p1f7blYiOs,3806
@@ -841,7 +842,7 @@ enap_designsystem/templates/enap_designsystem/semana_inovacao/block_secao_contat
 enap_designsystem/templates/enap_designsystem/semana_inovacao/block_secao_faq.html,sha256=HCa77ye5LISBQG1A_qFCBfsVFeFvdScLEzOUIf1DNuU,2534
 enap_designsystem/templates/enap_designsystem/semana_inovacao/block_secao_premios.html,sha256=OM6PCL5Ub0OKFPo1gsoUZARE1_9LdQFYFIBgXKIjfM8,4863
 enap_designsystem/templates/enap_designsystem/semana_inovacao/block_testemunhos.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enap_designsystem/templates/enap_designsystem/semana_inovacao/blocks_menu_navigation.html,sha256=CyULm95CqmtwXUEg3GeWL3uL3jeoDbEOK_sJ-f9C-wY,4645
+enap_designsystem/templates/enap_designsystem/semana_inovacao/blocks_menu_navigation.html,sha256=Wkh72siDu2OB2860mFeCKWLCKGe5KQ4yBBTxp3HS37Q,4663
 enap_designsystem/templates/enap_designsystem/semana_inovacao/certificado_block.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 enap_designsystem/templates/enap_designsystem/semana_inovacao/certificado_imagem_block.html,sha256=unIel1koGOyCjyYOqf-bBFD1f-i0_i01892ueBX1T98,211
 enap_designsystem/templates/enap_designsystem/semana_inovacao/concurso_inovacao.html,sha256=bR1N3HizUgG9JS0yyH_IBDFfk2QEKjCjRJ2NUxAy-Fw,3235
@@ -881,8 +882,8 @@ enap_designsystem/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 enap_designsystem/utils/decorators.py,sha256=aq6SbLn0LcH2rfE3ZFit8jkD7pSx9fLVBUUwVB747hg,335
 enap_designsystem/utils/services.py,sha256=6dG5jLSbwH49jpZV9ZNpWlaZqI49gTlwlr1vaerxdiU,5824
 enap_designsystem/utils/sso.py,sha256=vjAuoYgoLeQAa_dkkyQ6-LmHvKMaVCxizNFpe5y3iUA,1145
-wagtail_enap_designsystem-1.2.1.152.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-wagtail_enap_designsystem-1.2.1.152.dist-info/METADATA,sha256=tWvUGS7cVn1MMOpIW_5PhwfpgnIICOoRVUieEVPOtrw,3651
-wagtail_enap_designsystem-1.2.1.152.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wagtail_enap_designsystem-1.2.1.152.dist-info/top_level.txt,sha256=RSFgMASxoA-hVftm5i4Qd0rArlX4Dq08lLv5G4sYD-g,18
-wagtail_enap_designsystem-1.2.1.152.dist-info/RECORD,,
+wagtail_enap_designsystem-1.2.1.153.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+wagtail_enap_designsystem-1.2.1.153.dist-info/METADATA,sha256=radoIAIQaml8OosFYNAKajURD1s0G8fBTkwivcxEhow,3651
+wagtail_enap_designsystem-1.2.1.153.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wagtail_enap_designsystem-1.2.1.153.dist-info/top_level.txt,sha256=RSFgMASxoA-hVftm5i4Qd0rArlX4Dq08lLv5G4sYD-g,18
+wagtail_enap_designsystem-1.2.1.153.dist-info/RECORD,,