Place news last on frontpage, hide while loading, fix #348

spraakbanken · May 8, 2024 · 4586226 · 4586226
1 parent a806d98
commit 4586226
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/scripts/components/frontpage.ts b/app/scripts/components/frontpage.ts
@@ -30,9 +30,9 @@ export default angular.module("korpApp").component("frontpage", {
                 <search-examples ng-if="$root._settings['frontpage']['examples']" class="w-80 grow"></search-examples>
             </div>
 
-            <newsdesk ng-if="newsdeskIsEnabled" class="w-80 grow"></newsdesk>
-
             <corpus-updates class="w-80 grow"></corpus-updates>
+
+            <newsdesk ng-if="newsdeskIsEnabled" class="w-80 grow"></newsdesk>
         </div>
     `,
     bindings: {},

diff --git a/app/scripts/components/newsdesk.ts b/app/scripts/components/newsdesk.ts
@@ -5,7 +5,7 @@ import { type NewsItem, fetchNews, isEnabled } from "@/news-service"
 
 angular.module("korpApp").component("newsdesk", {
     template: html`
-        <div ng-if="isEnabled">
+        <div ng-if="isEnabled && itemsFiltered && itemsFiltered.length">
             <h2 class="text-xl font-bold">{{ 'newsdesk-header' | loc:$root.lang }}</h2>
             <div class="my-2 flex flex-col gap-2">
                 <article ng-repeat="item in itemsFiltered">
@@ -36,6 +36,7 @@ angular.module("korpApp").component("newsdesk", {
 
             $scope.isEnabled = isEnabled()
             $scope.items = null
+            $scope.itemsFiltered = null
             $scope.expanded = false
             $scope.NEWS_LIMIT = 3