@opengeoweb/taf 15.0.0 → 15.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/taf",
-  "version": "15.0.0",
+  "version": "15.2.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.2.0",
+    "@opengeoweb/shared": "15.2.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.2.0",
+    "@opengeoweb/form-fields": "15.2.0",
+    "@opengeoweb/authentication": "15.2.0",
     "@reduxjs/toolkit": "^2.6.1",
     "react-redux": "^9.2.0",
-    "@opengeoweb/snackbar": "15.0.0",
+    "@opengeoweb/snackbar": "15.2.0",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.1",
     "@emotion/react": "^11.11.1",

package/src/lib/NafDemo.stories.d.ts

@@ -0,0 +1,7 @@
+import type { Meta, StoryObj } from '@storybook/react-webpack5';
+import { TafModule } from './components/TafModule';
+type Story = StoryObj<typeof TafModule>;
+declare const meta: Meta<typeof TafModule>;
+export default meta;
+export declare const NafModuleLightTheme: Story;
+export declare const NafModuleDarkTheme: Story;

package/src/lib/components/ComponentsLookUp/ComponentsLookUp.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { ApiModule, ApiUrls } from '@opengeoweb/api';
+import type { TafType } from '../../types';
 export declare const tafScreenPreset: {
     id: string;
     title: string;
@@ -19,6 +20,7 @@ export declare const tafScreenPreset: {
 type TafComponentType = 'TafModule';
 interface InitialProps {
     isAutoTafEnabled?: boolean;
+    type?: TafType;
 }
 export interface ComponentsLookUpPayload {
     componentType: TafComponentType;

package/src/lib/components/TafForm/TafForm.d.ts

@@ -10,6 +10,7 @@ export interface TafFormProps {
     setIsIssuesPaneOpen?: (isOpen: boolean, position: IssuesPanePosition) => void;
     onSwitchEditor?: (formValues: TafFromFrontEnd) => Promise<boolean>;
     previousTaf?: Taf;
+    shouldEnableRemark?: boolean;
 }
 declare const TafForm: React.FC<TafFormProps>;
 export default TafForm;

package/src/lib/components/TafForm/TafForm.stories.d.ts

@@ -4,6 +4,7 @@ import type { TafFromBackend } from '../../types';
 interface WrapperProps {
     tafFromBackend: TafFromBackend;
     isDisabled?: boolean;
+    shouldEnableRemark?: boolean;
 }
 declare const Wrapper: React.FC<WrapperProps>;
 declare const _default: {
@@ -23,3 +24,4 @@ export declare const EditTafFormWithMultipleSameStartDatesLight: Story;
 export declare const EditTafFormWithMultipleSameStartDatesDark: Story;
 export declare const EditTafFormWithFMOverlapLight: Story;
 export declare const EditTafFormWithFMOverlapDark: Story;
+export declare const EditTafFormWithRemark: Story;

package/src/lib/components/TafForm/TafFormRow/TafFormTextField.d.ts

@@ -1,9 +1,13 @@
 import type { TextFieldProps } from '@mui/material';
 import React from 'react';
 import type { RegisterOptions } from 'react-hook-form';
+export declare const TEXTFIELD_WIDTH_PERCENTAGE: number;
+export declare const TEXTFIELD_MIN_WIDTH = "60px";
+type TextAlign = 'left' | 'center';
 export declare const getDisplayValue: (value: string, disabled: boolean) => string;
 type BaseTextFieldProps = TextFieldProps & {
     shouldPreventUppercase?: boolean;
+    textAlign?: TextAlign;
 };
 export declare const BaseTextField: React.FC<BaseTextFieldProps>;
 interface TafFormTextFieldProps {

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

@@ -64,8 +64,8 @@ export declare const getTafStatusLabel: (t: TFunction, status: TafStatus, action
 export declare const getMessageType: (taf: Taf, tafAction: TafActions) => string;
 export declare const getAmendedCorrectedTafTimes: (taf: Taf, tafAction: TafActions) => Taf;
 export declare const createChangeGroup: (changeGroup: ChangeGroupFormData) => ChangeGroupFormData;
-export declare const prepareTafValues: (_taf: Taf, tafAction: TafActions, addEmptyChangeGroups?: boolean) => TafFormData;
-export declare const prepareTafExportValues: (tafToCopy: Taf, currentTaf: TafFormData) => TafFormData;
+export declare const prepareTafValues: (_taf: Taf, tafAction: TafActions, addEmptyChangeGroups?: boolean, shouldEnableRemark?: boolean) => TafFormData;
+export declare const prepareTafExportValues: (tafToCopy: Taf, currentTaf: TafFormData, shouldEnableRemark?: boolean) => TafFormData;
 export declare const clearTafFormData: (tafFormValues: TafFormData) => TafFormData;
 export declare const getIsFormDefaultDisabled: (status: TafStatus) => boolean;
 export declare const fromStatusToAction: (tafStatus: TafStatus) => TafActions;

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

@@ -7,5 +7,7 @@ export declare const DemoTafLayoutLightTheme: Story;
 export declare const DemoTafLayoutDarkTheme: Story;
 export declare const TafLayoutLight: Story;
 export declare const TafLayoutDark: Story;
+export declare const NafLayoutLight: Story;
+export declare const NafLayoutDark: Story;
 export declare const TafLayoutAutoTaf: Story;
 export declare const TafLayoutAutoTafDark: Story;

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

@@ -17,6 +17,7 @@ interface TafPanelProps {
     error?: TafError | null;
     previousTaf: Taf;
     tafAction: TafActions;
+    shouldEnableRemark?: boolean;
 }
 declare const TafPanel: React.FC<TafPanelProps>;
 export default TafPanel;

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

@@ -1,6 +1,8 @@
 import type { AxiosError } from 'axios';
 import type { TFunction } from 'i18next';
-import type { AutoTAFlocations, Taf, TafConfig, TafConfigLocation, TafConfigLocations, TafFromBackend, TafFromFrontEnd, TafStatus, TimeSlot } from '../../types';
+import type { AutoTAFlocations, Taf, TafConfig, TafConfigLocation, TafConfigLocations, TafConfigLocationFixedPeriod, TafConfigLocationDynamicPeriod, TafFromBackend, TafFromFrontEnd, TafStatus, TimeSlot } from '../../types';
+export declare const isTafConfigLocationFixedPeriod: (location: TafConfigLocation) => location is TafConfigLocationFixedPeriod;
+export declare const isTafConfigLocationDynamicPeriod: (location: TafConfigLocation) => location is TafConfigLocationDynamicPeriod;
 export declare const getLocationSetting: (location: string, locationSettings: TafConfigLocations) => TafConfigLocation;
 export declare const sortTafsOnLocation: (tafList?: TafFromBackend[], locationOrder?: string[]) => TafFromBackend[];
 export declare const sortTafsOnIssueDate: (tafList?: TafFromBackend[]) => TafFromBackend[];
@@ -8,6 +10,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[];

package/src/lib/components/TafModule/TafModule.d.ts

@@ -1,7 +1,9 @@
 import type { FC } from 'react';
 import type { TafModuleProviderProps } from './TafModuleProvider';
+import type { TafType } from '../../types';
 export declare const getCurrentDate: () => string;
 declare const Wrapper: FC<TafModuleProviderProps & {
     isAutoTafEnabled?: boolean;
+    type?: TafType;
 }>;
 export default Wrapper;

package/src/lib/components/TafRemarkField/TafRemarkField.d.ts

@@ -0,0 +1,7 @@
+import type { FC } from 'react';
+export interface TafRemarkFieldProps {
+    disabled?: boolean;
+    isEditor?: boolean;
+}
+declare const TafRemarkField: FC<TafRemarkFieldProps>;
+export default TafRemarkField;

package/src/lib/components/TafRemarkField/TafRemarkField.spec.d.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

package/src/lib/components/TafRemarkField/index.d.ts

@@ -0,0 +1 @@
+export { default as TafRemarkField } from './TafRemarkField';

package/src/lib/components/TafWrapper/TafConfigWrapper.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { TafConfig } from '../../types';
+import type { TafConfig, TafType } from '../../types';
 interface TafConfigWrapperContext {
     tafConfig?: TafConfig;
 }
@@ -7,6 +7,7 @@ export declare const TafConfigContext: React.Context<TafConfigWrapperContext>;
 export declare const useTafConfigContext: () => Partial<TafConfigWrapperContext>;
 interface TafConfigWrapperProps {
     children?: React.ReactNode;
+    type?: TafType;
 }
 declare const TafConfigWrapper: React.FC<TafConfigWrapperProps>;
 export default TafConfigWrapper;

package/src/lib/types.d.ts

@@ -51,7 +51,9 @@ export interface ChangeGroup extends BaseForecast {
     probability?: 'PROB30' | 'PROB40';
 }
 export type MessageType = 'ORG' | 'AMD' | 'COR' | 'CNL';
-export type Location = 'EHAM' | 'EHRD' | 'EHGG' | 'EHBK' | 'EHLE' | 'TNCB';
+export type NafLocation = 'EHAK' | 'EHFD' | 'EHDV' | 'EHHW' | 'EHKV' | 'EHMG' | 'EHMA' | 'EHQN' | 'EHPG';
+export type Location = 'EHAM' | 'EHRD' | 'EHGG' | 'EHBK' | 'EHLE' | 'TNCB' | NafLocation;
+export type TafType = 'TAF' | 'NAF';
 export interface BaseTaf {
     validDateStart: TafDate;
     validDateEnd: TafDate;
@@ -63,8 +65,10 @@ export interface BaseTaf {
     baseForecast: BaseForecast;
     changeGroups?: ChangeGroup[];
     messageType: MessageType;
+    remark?: string;
     uuid: string;
     issueDate?: TafDate;
+    type?: TafType;
 }
 export type TafStatus = 'NEW' | 'DRAFT' | 'DRAFT_AMENDED' | 'DRAFT_CORRECTED' | 'PUBLISHED' | 'CORRECTED' | 'AMENDED' | 'CANCELLED' | 'EXPIRED' | 'AUTO';
 export type TafActions = 'NEW' | 'DRAFT' | 'DRAFT_AMEND' | 'DRAFT_CORRECT' | 'PUBLISH' | 'CANCEL' | 'CORRECT' | 'AMEND' | 'CLOSE' | 'CLEAR';
@@ -99,6 +103,7 @@ export interface TafFormData {
     uuid: string;
     issueDate?: string;
     status: TafStatus;
+    remark?: string;
 }
 /**
  * Type with TAF info from the backend
@@ -120,11 +125,17 @@ export interface TafFromFrontEnd {
 /**
  * TAF (json) settings (libs/taf/src/lib/utils/tafConfig.json)
  */
-export interface TafConfigLocation {
+export type TafConfigLocation = TafConfigLocationFixedPeriod | TafConfigLocationDynamicPeriod;
+export interface TafConfigLocationFixedPeriod {
     validity_duration: number;
     activity_period: number;
     label: string;
 }
+export interface TafConfigLocationDynamicPeriod {
+    valid_durations: number[];
+    valid_start_times: number[];
+    label: string;
+}
 export type TafConfigLocations = Record<string, TafConfigLocation>;
 export type AutoTAFlocations = string[];
 export interface TafConfig {
@@ -132,6 +143,8 @@ export interface TafConfig {
     locations: TafConfigLocations;
     locationOrder: string[];
     autoTAFlocations?: AutoTAFlocations;
+    shouldEnableRemark?: boolean;
+    type: TafType;
 }
 export type TimeSlot = 'UPCOMING' | 'ACTIVE' | 'EXPIRED';
 export interface AdverseWeatherTAC {

package/src/lib/utils/mockdata/fakeTafConfig.d.ts

@@ -0,0 +1,2 @@
+import type { TafConfig } from '../../types';
+export declare const fakeTafConfig: TafConfig;

package/src/lib/utils/mockdata/fakeTafList.d.ts

@@ -23,3 +23,4 @@ export declare const fakePublishedTafWithChangeGroups: TafFromBackend;
 export declare const fakeDraftTafWithSameDates: TafFromBackend;
 export declare const fakeDraftTafWithSameDatesFixed: TafFromBackend;
 export declare const fakeDraftTafWithFM: TafFromBackend;
+export declare const fakeCurrentTaf: TafFromBackend;

package/src/lib/utils/mockdata/naf/fakeNafConfig.d.ts

@@ -0,0 +1,2 @@
+import type { TafConfig } from '../../../types';
+export declare const fakeNafConfig: TafConfig;

package/src/lib/utils/mockdata/naf/fakeNafList.d.ts

@@ -0,0 +1,12 @@
+import type { TafFromBackend } from '../../../types';
+export declare const MOCK_USERNAME = "user.name";
+export declare const fakeNafList: TafFromBackend[];
+export declare const fakeFixedNaf: TafFromBackend;
+export declare const fakeLastInDayNaf: TafFromBackend;
+export declare const fakeNewFixedNaf: TafFromBackend;
+export declare const fakeDraftFixedNaf: TafFromBackend;
+export declare const fakePublishedFixedNaf: TafFromBackend;
+export declare const fakeDraftAmendmentFixedNaf: TafFromBackend;
+export declare const fakeAmendmentFixedNaf: TafFromBackend;
+export declare const fakeCancelledFixedNaf: TafFromBackend;
+export declare const fakeFixedNafList: TafFromBackend[];

package/src/lib/utils/taf-api/api.d.ts

@@ -1,7 +1,7 @@
 import type { Credentials } from '@opengeoweb/authentication';
-import type { TAC, Taf, TafConfig, TafFromBackend, TafFromFrontEnd } from '../../types';
-export declare const getTafList: (auth: Credentials) => Promise<TafFromBackend[]>;
+import type { TAC, Taf, TafConfig, TafFromBackend, TafFromFrontEnd, TafType } from '../../types';
+export declare const getTafList: (auth: Credentials, type?: TafType) => Promise<TafFromBackend[]>;
 export declare const postTaf: (auth: Credentials, data: TafFromFrontEnd) => Promise<Response>;
 export declare const patchTaf: (auth: Credentials, data: TafFromFrontEnd, force?: boolean) => Promise<Response>;
 export declare const getTAC: (auth: Credentials, data: Taf) => Promise<TAC>;
-export declare const getTafConfig: (auth: Credentials) => Promise<TafConfig>;
+export declare const getTafConfig: (auth: Credentials, type?: TafType) => Promise<TafConfig>;

package/src/lib/utils/taf-api/fakeApi.d.ts

@@ -1,6 +1,4 @@
-import type { AdverseWeatherTAC, TafFromBackend, TafConfig } from '../../types';
-export declare const getFakeUpdatedList: () => TafFromBackend[];
+import type { AdverseWeatherTAC } from '../../types';
 export declare const fakeTafTac = "TAF EHAM 0812/0918 20020G35KT 0500 SN BKN040 BECMG 0814/0816 0700 BKN001=";
 export declare const fakeTafTacJson: AdverseWeatherTAC;
-export declare const fakeTafConfig: TafConfig;
 export declare const tafEndPoints: import("msw").HttpHandler[];

package/src/lib/utils/taf-api/hooks.d.ts

@@ -1,8 +1,8 @@
 import type { UseMutationResult, UseQueryResult } from '@tanstack/react-query';
 import type { TafError } from '../../components/TafLayout/utils';
-import type { TAC, Taf, TafFromBackend, TafFromFrontEnd, TafConfig } from '../../types';
-export declare const useTafList: (disabled?: boolean) => UseQueryResult<TafFromBackend[]>;
-export declare const useTafConfig: (disabled?: boolean) => UseQueryResult<TafConfig>;
+import type { TAC, Taf, TafFromBackend, TafFromFrontEnd, TafConfig, TafType } from '../../types';
+export declare const useTafList: (type?: TafType, disabled?: boolean) => UseQueryResult<TafFromBackend[]>;
+export declare const useTafConfig: (type?: TafType, disabled?: boolean) => UseQueryResult<TafConfig>;
 type PostReturnType<T> = UseMutationResult<Response | null, Error, T>;
 interface PostTafProps {
     tafData: TafFromFrontEnd;