@opengeoweb/taf 15.0.0 → 15.1.0

package/index.esm.js

@@ -103,7 +103,8 @@ var en = {
 	autotaf: "Autotaf",
 	"autotaf-no-data": "No autoTAFs available",
 	"autotaf-no-location": "No data available for this location",
-	"autotaf-no-config": "Missing config key: autoTAFlocations"
+	"autotaf-no-config": "Missing config key: autoTAFlocations",
+	"no-locations-message": "No locations available for this timeslot"
 };
 var fi = {
 	"issues-button-title": "Näkymän yksityiskohdat",
@@ -355,7 +356,8 @@ var nl = {
 	autotaf: "Autotaf",
 	"autotaf-no-data": "Geen autoTAFs beschikbaar",
 	"autotaf-no-location": "Geen data beschikbaar voor deze locatie",
-	"autotaf-no-config": "Ontbrekende configuratie: autoTAFlocations"
+	"autotaf-no-config": "Ontbrekende configuratie: autoTAFlocations",
+	"no-locations-message": "Geen locaties beschikbaar voor dit tijdslot"
 };
 var tafTranslations = {
 	en: en,
@@ -3076,6 +3078,32 @@ var getBaseTime = function getBaseTime(baseTime, location, tafConfig) {
     nextBaseTime: nextBaseTime
   };
 };
+/**
+ * If we don't have a taf to get the baseTime from, we calculate it based on the current time and the activity_period from the config.
+ * @param tafConfig
+ * @returns
+ */
+var calculateBaseTime = function calculateBaseTime(tafConfig) {
+  var currentTime = dateUtils.utc();
+  var currentHour = dateUtils.getHours(currentTime);
+  // take the first location from config (via locationOrder)
+  var firstLocation = tafConfig.locationOrder[0];
+  var activityPeriod = getLocationSetting(firstLocation, tafConfig.locations).activity_period;
+  var baseHour = Math.floor(currentHour / activityPeriod) * activityPeriod;
+  var currentBaseTime = dateUtils.set(currentTime, {
+    hours: baseHour,
+    minutes: 0,
+    seconds: 0,
+    milliseconds: 0
+  });
+  var nextBaseTime = dateUtils.add(currentBaseTime, {
+    hours: activityPeriod
+  });
+  return {
+    currentBaseTime: currentBaseTime,
+    nextBaseTime: nextBaseTime
+  };
+};
 var getTafTimeSlot = function getTafTimeSlot(baseTime, location, status, tafConfig) {
   var now = dateUtils.utc();
   var _getBaseTime = getBaseTime(baseTime, location, tafConfig),
@@ -6533,28 +6561,19 @@ var TafPanel = function TafPanel(_ref) {
 
 var TopTabs = function TopTabs(_ref) {
   var timeSlot = _ref.timeSlot,
+    tafFromBackend = _ref.tafFromBackend,
     _ref$onChangeTimeSlot = _ref.onChangeTimeSlot,
-    onChangeTimeSlot = _ref$onChangeTimeSlot === void 0 ? function () {} : _ref$onChangeTimeSlot,
-    _ref$tafFromBackend = _ref.tafFromBackend,
-    tafFromBackend = _ref$tafFromBackend === void 0 ? {
-      taf: {
-        baseTime: '2022-01-06T12:00:00Z',
-        location: 'EHAM'
-      }
-    } : _ref$tafFromBackend;
+    onChangeTimeSlot = _ref$onChangeTimeSlot === void 0 ? function () {} : _ref$onChangeTimeSlot;
   var _useTafTranslation = useTafTranslation(),
     t = _useTafTranslation.t;
   var _useFormContext = useFormContext(),
     isDirty = _useFormContext.formState.isDirty;
   var _useTafConfigContext = useTafConfigContext(),
     tafConfig = _useTafConfigContext.tafConfig;
-  if (!tafFromBackend) {
-    return null;
-  }
   var activeTab = timeSlot === 'UPCOMING' ? 0 : 1;
-  var _getBaseTime = getBaseTime(tafFromBackend.taf.baseTime, tafFromBackend.taf.location, tafConfig),
-    currentBaseTime = _getBaseTime.currentBaseTime,
-    nextBaseTime = _getBaseTime.nextBaseTime;
+  var _ref2 = tafFromBackend ? getBaseTime(tafFromBackend.taf.baseTime, tafFromBackend.taf.location, tafConfig) : calculateBaseTime(tafConfig),
+    currentBaseTime = _ref2.currentBaseTime,
+    nextBaseTime = _ref2.nextBaseTime;
   var tabs = [{
     title: t('top-tabs-upcoming') + " " + formatBaseTime(nextBaseTime),
     timeSlot: 'UPCOMING'
@@ -6650,8 +6669,7 @@ var TafLayout = function TafLayout(_ref) {
     current = _React$useState$.current,
     expired = _React$useState$.expired,
     updateSortedTafs = _React$useState[1];
-  var _current$slice = current.slice(-1),
-    lastCurrentTaf = _current$slice[0];
+  var lastCurrentTaf = current.length > 0 ? current[current.length - 1] : undefined;
   var _React$useState2 = React.useState('UPCOMING'),
     timeSlot = _React$useState2[0],
     setTimeSlot = _React$useState2[1];
@@ -6889,94 +6907,93 @@ var TafLayout = function TafLayout(_ref) {
               onPressRefresh: onUpdateTaf
             }) : null
           })]
-        }), jsx(Grid, {
+        }), jsxs(Grid, {
           container: true,
+          spacing: 2,
           sx: {
-            flexGrow: 1,
-            overflow: 'hidden'
+            height: '100%',
+            paddingLeft: 1,
+            paddingRight: 1,
+            paddingTop: 2,
+            overflow: 'auto'
           },
-          children: jsxs(Grid, {
-            container: true,
-            spacing: 2,
-            sx: {
-              height: '100%',
-              paddingLeft: 1,
-              paddingRight: 1,
-              paddingTop: 2,
-              overflow: 'auto'
+          children: [jsx(Grid, {
+            size: {
+              xs: 3,
+              sm: 1
             },
-            children: [jsx(Grid, {
-              size: {
-                xs: 3,
-                sm: 1
-              },
-              children: jsx(LocationTabs, {
-                activeIndex: activeTafIndex,
-                onChangeTab: onChangeLocationTab,
-                tafList: locations,
-                timeSlot: timeSlot
-              })
-            }), jsx(Grid, {
-              size: "grow",
-              children: jsxs(Card, {
-                sx: {
-                  marginBottom: '12px',
-                  position: 'relative',
-                  minHeight: locations.length * 62 + 32
-                },
-                variant: "outlined",
-                children: [jsx(TacOverviewMobile, Object.assign({
-                  activeTaf: activeTaf,
-                  currentTafs: current,
-                  expiredTafs: expired,
-                  upcomingTafs: upcoming
-                }, isAutoTafEnabled && {
-                  autoTafs: autoTafList
-                })), locations.map(function (tafFromBackend, index) {
-                  return jsx(TafPanel, {
-                    activeTafIndex: activeTafIndex,
-                    error: error,
-                    index: index,
-                    isFormDisabled: isFormDisabled,
-                    isIssuesPaneOpen: isIssuesPaneOpen,
-                    isLoading: isPostTafPending,
-                    patchTaf: patchTaf,
-                    postTaf: postTaf,
-                    previousTaf: getPreviousTaf(tafList, tafFromBackend),
-                    setIsFormDisabled: setIsFormDisabled,
-                    setIsIssuesPaneOpen: onToggleIssuesPane,
-                    tafAction: tafAction,
-                    tafFromBackend: tafFromBackend
-                  }, tafFromBackend.taf.uuid);
-                })]
-              })
-            }), jsxs(Grid, {
-              size: {
-                xs: 0,
-                sm: 3
+            children: jsx(LocationTabs, {
+              activeIndex: activeTafIndex,
+              onChangeTab: onChangeLocationTab,
+              tafList: locations,
+              timeSlot: timeSlot
+            })
+          }), jsx(Grid, {
+            size: "grow",
+            children: jsxs(Card, {
+              sx: {
+                marginBottom: '12px',
+                position: 'relative',
+                minHeight: locations.length * 62 + 32
               },
-              sx: Object.assign({
-                height: {
-                  xs: 0,
-                  sm: '100%'
-                }
-              }, isAutoTafEnabled && {
-                display: 'flex',
-                flexDirection: 'column'
-              }),
-              children: [jsx(TacOverview, {
+              variant: "outlined",
+              children: [jsx(TacOverviewMobile, Object.assign({
                 activeTaf: activeTaf,
                 currentTafs: current,
                 expiredTafs: expired,
-                isFormDisabled: isFormDisabled,
                 upcomingTafs: upcoming
-              }), isAutoTafEnabled ? jsx(AutoTaf, {
-                activeTaf: activeTaf,
-                isFormDisabled: isFormDisabled,
-                tafList: autoTafList
-              }) : null]
-            })]
-          })
+              }, isAutoTafEnabled && {
+                autoTafs: autoTafList
+              })), locations.length > 0 ? locations.map(function (tafFromBackend, index) {
+                return jsx(TafPanel, {
+                  activeTafIndex: activeTafIndex,
+                  error: error,
+                  index: index,
+                  isFormDisabled: isFormDisabled,
+                  isIssuesPaneOpen: isIssuesPaneOpen,
+                  isLoading: isPostTafPending,
+                  patchTaf: patchTaf,
+                  postTaf: postTaf,
+                  previousTaf: getPreviousTaf(tafList, tafFromBackend),
+                  setIsFormDisabled: setIsFormDisabled,
+                  setIsIssuesPaneOpen: onToggleIssuesPane,
+                  tafAction: tafAction,
+                  tafFromBackend: tafFromBackend
+                }, tafFromBackend.taf.uuid);
+              }) : jsx(Typography, {
+                sx: {
+                  margin: 1
+                },
+                variant: "body1",
+                children: t('no-locations-message')
+              })]
+            })
+          }), jsxs(Grid, {
+            size: {
+              xs: 0,
+              sm: 3
+            },
+            sx: Object.assign({
+              height: {
+                xs: 0,
+                sm: '100%'
+              }
+            }, isAutoTafEnabled && {
+              display: 'flex',
+              flexDirection: 'column'
+            }),
+            children: [jsx(TacOverview, {
+              activeTaf: activeTaf,
+              currentTafs: current,
+              expiredTafs: expired,
+              isFormDisabled: isFormDisabled,
+              upcomingTafs: upcoming
+            }), isAutoTafEnabled ? jsx(AutoTaf, {
+              activeTaf: activeTaf,
+              isFormDisabled: isFormDisabled,
+              tafList: autoTafList
+            }) : null]
+          })]
         })]
       })
     }), jsx(IssuesPaneWrapper, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "description": "GeoWeb TAF library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,15 +8,15 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "15.0.0",
-    "@opengeoweb/shared": "15.0.0",
+    "@opengeoweb/api": "15.1.0",
+    "@opengeoweb/shared": "15.1.0",
     "react-hook-form": "^7.50.1",
-    "@opengeoweb/theme": "15.0.0",
-    "@opengeoweb/form-fields": "15.0.0",
-    "@opengeoweb/authentication": "15.0.0",
+    "@opengeoweb/theme": "15.1.0",
+    "@opengeoweb/form-fields": "15.1.0",
+    "@opengeoweb/authentication": "15.1.0",
     "@reduxjs/toolkit": "^2.6.1",
     "react-redux": "^9.2.0",
-    "@opengeoweb/snackbar": "15.0.0",
+    "@opengeoweb/snackbar": "15.1.0",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.1",
     "@emotion/react": "^11.11.1",

package/src/lib/components/TafLayout/TopTabs/TopTabs.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { TafFromBackend, TimeSlot } from '../../../types';
 interface TopTabsProps {
     timeSlot: TimeSlot;
-    tafFromBackend: TafFromBackend;
+    tafFromBackend?: TafFromBackend;
     onChangeTimeSlot?: (timeSlot: TimeSlot, isFormDirty: boolean) => void;
 }
 declare const TopTabs: React.FC<TopTabsProps>;

package/src/lib/components/TafLayout/utils.d.ts

@@ -8,6 +8,15 @@ export declare const getBaseTime: (baseTime: string, location: string, tafConfig
     currentBaseTime: Date;
     nextBaseTime: Date;
 };
+/**
+ * If we don't have a taf to get the baseTime from, we calculate it based on the current time and the activity_period from the config.
+ * @param tafConfig
+ * @returns
+ */
+export declare const calculateBaseTime: (tafConfig: TafConfig) => {
+    currentBaseTime: Date;
+    nextBaseTime: Date;
+};
 export declare const getTafTimeSlot: (baseTime: string, location: string, status: TafStatus, tafConfig: TafConfig) => TimeSlot;
 interface TafTimeSlots {
     current: TafFromBackend[];