@opengeoweb/taf 2.3.0 → 2.4.0

package/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@mui/material'), require('@mui/styles/makeStyles'), require('moment'), require('@opengeoweb/shared'), require('@mui/icons-material'), require('@opengeoweb/api'), require('@opengeoweb/form-fields'), require('react-hook-form'), require('react-sortablejs'), require('lodash')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'react', '@mui/material', '@mui/styles/makeStyles', 'moment', '@opengeoweb/shared', '@mui/icons-material', '@opengeoweb/api', '@opengeoweb/form-fields', 'react-hook-form', 'react-sortablejs', 'lodash'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Taf = {}, global.React, global.material, global.makeStyles, global.moment, global.shared, global.iconsMaterial, global.api, global.formFields, global.reactHookForm, global.reactSortablejs, global.lodash));
-})(this, (function (exports, React, material, makeStyles, moment, shared, iconsMaterial, api, formFields, reactHookForm, reactSortablejs, lodash) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@opengeoweb/form-fields'), require('@mui/material'), require('react-hook-form'), require('react-sortablejs'), require('@opengeoweb/api'), require('@opengeoweb/shared'), require('moment'), require('lodash'), require('@mui/styles/makeStyles'), require('@mui/icons-material'), require('react-dom'), require('@mui/material/LinearProgress'), require('@mui/icons-material/DoDisturb'), require('@mui/material/Box')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'react', '@opengeoweb/form-fields', '@mui/material', 'react-hook-form', 'react-sortablejs', '@opengeoweb/api', '@opengeoweb/shared', 'moment', 'lodash', '@mui/styles/makeStyles', '@mui/icons-material', 'react-dom', '@mui/material/LinearProgress', '@mui/icons-material/DoDisturb', '@mui/material/Box'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Taf = {}, global.React, global.formFields, global.material, global.reactHookForm, global.reactSortablejs, global.api, global.shared, global.moment, global.lodash, global.makeStyles, global.iconsMaterial, global.ReactDOM, global.LinearProgress, global.DoDisturbIcon, global.Box));
+})(this, (function (exports, React, formFields, material, reactHookForm, reactSortablejs, api, shared, moment, lodash, makeStyles, iconsMaterial, ReactDOM, LinearProgress, DoDisturbIcon, Box) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,8 +26,12 @@
 
     var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
     var React__namespace = /*#__PURE__*/_interopNamespace(React);
-    var makeStyles__default = /*#__PURE__*/_interopDefaultLegacy(makeStyles);
     var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
+    var makeStyles__default = /*#__PURE__*/_interopDefaultLegacy(makeStyles);
+    var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
+    var LinearProgress__default = /*#__PURE__*/_interopDefaultLegacy(LinearProgress);
+    var DoDisturbIcon__default = /*#__PURE__*/_interopDefaultLegacy(DoDisturbIcon);
+    var Box__default = /*#__PURE__*/_interopDefaultLegacy(Box);
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -105,18 +109,6 @@
         }
     }
 
-    function __values(o) {
-        var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-        if (m) return m.call(o);
-        if (o && typeof o.length === "number") return {
-            next: function () {
-                if (o && i >= o.length) o = void 0;
-                return { value: o && o[i++], done: !o };
-            }
-        };
-        throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-    }
-
     function __read(o, n) {
         var m = typeof Symbol === "function" && o[Symbol.iterator];
         if (!m) return o;
@@ -144,77 +136,6 @@
         return to.concat(ar || Array.prototype.slice.call(from));
     }
 
-    /* *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
-     * */
-    var useTafSettings = function useTafSettings( // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types
-    tafConfig) {
-      var locations = tafConfig.locations;
-      return {
-        locations: locations
-      };
-    };
-
-    var location_indicator_mwo = "EHDB";
-    var locations = {
-    	EHAM: {
-    		validity_duration: 30,
-    		activity_period: 6,
-    		label: "Schiphol"
-    	},
-    	EHRD: {
-    		validity_duration: 30,
-    		activity_period: 6,
-    		label: "Rotterdam"
-    	},
-    	EHGG: {
-    		validity_duration: 30,
-    		activity_period: 6,
-    		label: "Eelde"
-    	},
-    	EHBK: {
-    		validity_duration: 30,
-    		activity_period: 6,
-    		label: "Maastricht"
-    	},
-    	EHLE: {
-    		validity_duration: 30,
-    		activity_period: 6,
-    		label: "Lelystad"
-    	},
-    	TNCB: {
-    		validity_duration: 30,
-    		activity_period: 6,
-    		label: "Bonaire"
-    	}
-    };
-    var locationOrder = [
-    	"EHAM",
-    	"EHRD",
-    	"EHLE",
-    	"EHGG",
-    	"EHBK",
-    	"TNCB"
-    ];
-    var tafConfig = {
-    	location_indicator_mwo: location_indicator_mwo,
-    	locations: locations,
-    	locationOrder: locationOrder
-    };
-
     function _typeof(obj) {
       "@babel/helpers - typeof";
 
@@ -2473,6 +2394,7 @@
       if (action === 'PUBLISH') return 'Publish';
       if (action === 'AMEND') return 'This TAF is an amendment';
       if (action === 'CORRECT') return 'This TAF is a correction';
+      if (action === 'CANCEL') return 'Cancel TAF';
       return 'Cancel TAF';
     }; // Check if the amended/corrected TAF has been changed. Only compare the fields users are able to fill in
     // (i.e. exclude baseforecast valid time as that gets updated when doing an amendment automatically outside of the users influence)
@@ -2514,90 +2436,179 @@
             return 'Discard';
           }
 
+        case 'CANCEL':
+          return 'Cancel';
+
         default:
           {
             return 'Publish';
           }
       }
     };
+    var emptyChangegroup = {
+      valid: '',
+      wind: '',
+      visibility: '',
+      weather: {
+        weather1: null,
+        weather2: null,
+        weather3: null
+      },
+      cloud: {
+        cloud1: null,
+        cloud2: null,
+        cloud3: null,
+        cloud4: null
+      },
+      change: null,
+      probability: null
+    };
+    var getTafStatusLabel = function getTafStatusLabel(status) {
+      switch (status) {
+        case 'DRAFT_AMENDED':
+          return 'draft amended';
 
-    var getTafErrors = function getTafErrors(name, errors) {
-      var nameAsArray = name.split('.');
+        case 'DRAFT_CORRECTED':
+          return 'draft corrected';
 
-      if (nameAsArray[0].includes('changeGroups')) {
-        if (errors.changeGroups) {
-          var changeGroupNum = nameAsArray[0].slice(13, nameAsArray[0].length - 1);
-          var restArray = nameAsArray.slice(1);
-          return formFields.getDeepProperty(restArray, errors.changeGroups[changeGroupNum]);
-        } // No changegroup errors
+        default:
+          return status.toLocaleLowerCase();
+      }
+    };
+    var getMessageType = function getMessageType(taf, tafAction) {
+      if (tafAction === 'CORRECT') {
+        return 'COR';
+      }
+
+      if (tafAction === 'AMEND') {
+        return 'AMD';
+      }
 
+      return taf.messageType;
+    }; // For corrections and amendment we need to add the previousValidStart and End for the TAC converter
 
-        return null;
+    var getAmendedCorrectedTafTimes = function getAmendedCorrectedTafTimes(taf, tafAction) {
+      var previousValidDateStart = taf.previousValidDateStart && tafAction !== 'AMEND' ? taf.previousValidDateStart : taf.validDateStart;
+      var previousValidDateEnd = taf.previousValidDateEnd && tafAction !== 'AMEND' ? taf.previousValidDateEnd : taf.validDateEnd; // For amendment change valid start time to current time
+      // only do this if we're already within the validity period
+
+      if ((tafAction === 'AMEND' || tafAction === 'DRAFT_AMEND') && moment__default["default"].utc() >= moment__default["default"].utc(taf.validDateStart)) {
+        var now = moment__default["default"].utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
+        var validObj = {
+          start: now,
+          end: taf.baseForecast.valid.end
+        };
+        return __assign(__assign({}, taf), {
+          previousValidDateStart: previousValidDateStart,
+          previousValidDateEnd: previousValidDateEnd,
+          validDateStart: now,
+          baseForecast: __assign(__assign({}, taf.baseForecast), {
+            valid: validObj
+          })
+        });
       }
 
-      return formFields.getDeepProperty(nameAsArray, errors);
+      return __assign(__assign({}, taf), {
+        previousValidDateStart: previousValidDateStart,
+        previousValidDateEnd: previousValidDateEnd
+      });
     };
+    var prepareTafValues = function prepareTafValues(_taf, tafAction, addEmptyChangeGroup) {
+      if (addEmptyChangeGroup === void 0) {
+        addEmptyChangeGroup = false;
+      } // If action is AMEND/CORRECT/DRAFT_AMEND/DRAFT_CORRECTION - add previous valid start and end
+      // If action is AMEND/DRAFT_AMEND - update validity start time to current time
 
-    var getDisplayValue = function getDisplayValue(value, disabled) {
-      return disabled && !value ? '-' : value;
+
+      var taf = tafAction === 'AMEND' || tafAction === 'DRAFT_AMEND' || tafAction === 'CORRECT' || tafAction === 'DRAFT_CORRECT' ? getAmendedCorrectedTafTimes(_taf, tafAction) : _taf;
+      return __assign(__assign(__assign(__assign({}, taf), {
+        messageType: getMessageType(taf, tafAction),
+        baseForecast: formatFormValues(taf.baseForecast)
+      }), taf.changeGroups && {
+        changeGroups: taf.changeGroups.map(formatFormValues)
+      }), addEmptyChangeGroup && {
+        changeGroups: [emptyChangegroup]
+      });
     };
-    var useStyles$8 = makeStyles__default["default"](function (theme) {
+
+    var textFieldStyle = function textFieldStyle(theme) {
       return {
-        textFieldInput: {
-          height: 46,
-          width: 56,
+        // input
+        marginRight: '2px',
+        marginBottom: '4px',
+        width: 56,
+        height: 46,
+        input: {
           textAlign: 'center',
           fontSize: 10,
           fontWeight: 500,
           paddingLeft: 0,
           paddingRight: 0,
-          marginBotom: '2px',
           '&.Mui-disabled': {
-            '-webkit-text-fill-color': theme.palette.geowebColors.typographyAndIcons.text,
-            color: theme.palette.geowebColors.typographyAndIcons.text,
-            '&:before': {
-              border: 'none'
-            }
+            color: 'geowebColors.typographyAndIcons.text',
+            WebkitTextFillColor: theme.palette.geowebColors.typographyAndIcons.text
+          },
+          // TODO: https://gitlab.com/opengeoweb/opengeoweb/-/issues/1995 disables the default autofill styling, should be a better fix
+          '&:-webkit-autofill': {
+            WebkitTransitionDelay: '86400s' // 1 day delay
+
           }
         },
-        textFieldLabel: {
+        label: {
+          transformOrigin: 'center top',
+          right: 0,
+          textAlign: 'center',
           fontSize: '10px',
           '&.Mui-disabled': {
-            color: theme.palette.geowebColors.captions.captionStatus.rgba
+            color: 'geowebColors.captions.captionStatus.rgba'
           },
           whiteSpace: 'nowrap',
-          maxWidth: '100%'
+          maxWidth: '100%',
+          transform: 'translate(0px, 16px) scale(1)'
         },
-        textFieldLabelShrink: {
+        // shrink
+        ' .MuiInputLabel-shrink': {
           transform: 'translate(2px, 10px) scale(0.75) !important',
-          letterSpacing: '0.33px'
+          letterSpacing: '0.33px',
+          textAlign: 'left'
+        },
+        // root
+        '&': {
+          '.Mui-disabled:before': {
+            borderColor: 'transparent'
+          }
         }
       };
-    });
+    };
+
+    var getTafErrors = function getTafErrors(name, errors) {
+      var nameAsArray = name.split('.');
+
+      if (nameAsArray[0].includes('changeGroups')) {
+        if (errors.changeGroups) {
+          var changeGroupNum = nameAsArray[0].slice(13, nameAsArray[0].length - 1);
+          var restArray = nameAsArray.slice(1);
+          return formFields.getDeepProperty(restArray, errors.changeGroups[changeGroupNum]);
+        } // No changegroup errors
+
+
+        return null;
+      }
+
+      return formFields.getDeepProperty(nameAsArray, errors);
+    };
+
+    var getDisplayValue = function getDisplayValue(value, disabled) {
+      return disabled && !value ? '-' : value;
+    };
     var BaseTextField = /*#__PURE__*/React__default["default"].memo(function (props) {
-      var classes = useStyles$8();
       return /*#__PURE__*/React__default["default"].createElement(material.TextField, __assign({
         type: "text",
         variant: "filled",
-        InputProps: {
-          classes: {
-            root: classes.textFieldInput,
-            input: classes.textFieldInput
-          }
-        },
-        InputLabelProps: {
-          classes: {
-            root: classes.textFieldLabel,
-            shrink: classes.textFieldLabelShrink
-          }
-        },
-        sx: {
-          marginRight: '2px',
-          marginBottom: '2px'
-        }
+        sx: textFieldStyle
       }, props));
     }, function (prevProps, nextProps) {
-      return prevProps.value === nextProps.value && prevProps.error === nextProps.error && prevProps.name === nextProps.name;
+      return prevProps.value === nextProps.value && prevProps.error === nextProps.error && prevProps.name === nextProps.name && prevProps.disabled === nextProps.disabled;
     });
 
     var TafFormTextField = function TafFormTextField(_a) {
@@ -2824,7 +2835,8 @@
       return /*#__PURE__*/React__namespace.createElement(shared.ToggleMenu, {
         buttonTestId: "tafFormOptions[" + index + "]",
         buttonSx: {
-          margin: '14px 10px'
+          marginTop: '10px',
+          marginLeft: '4px'
         },
         menuItems: isChangeGroup ? menuItemsChangeGroup : menuItemsBaseForecast
       });
@@ -2994,13 +3006,14 @@
         justifyContent: "flex-start",
         "data-testid": "row-" + namePrefix,
         container: true,
-        ref: ref
+        ref: ref,
+        columns: 24
       }, props), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
-        xs: 11
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         container: true,
-        justifyContent: "flex-end"
+        justifyContent: "flex-end",
+        xs: 24,
+        sm: 23
       }, !isChangeGroup && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(TafFormTextField, {
         label: "Type",
         name: fieldNames.messageType,
@@ -3257,9 +3270,16 @@
             }
           }
         }
-      }))), !disabled && /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+      })), !disabled && /*#__PURE__*/React__default["default"].createElement(material.Grid, {
         item: true,
-        xs: 1
+        container: true,
+        justifyContent: "flex-end",
+        alignItems: "flex-end",
+        xs: 24,
+        sm: 1,
+        sx: {
+          marginBottom: '16px'
+        }
       }, /*#__PURE__*/React__default["default"].createElement(TafFormOptionsButton, {
         isChangeGroup: isChangeGroup,
         addChangeGroupBelow: addChangeGroupBelow,
@@ -3272,76 +3292,6 @@
       })));
     });
 
-    var getIssuesLabel = function getIssuesLabel(sumOfErrors) {
-      switch (sumOfErrors) {
-        case 0:
-          return '0 issues';
-
-        case 1:
-          return '1 issue';
-
-        default:
-          return sumOfErrors + " issues";
-      }
-    };
-
-    var buttonColors = {
-      green: '#72bb23',
-      red: '#c00000'
-    };
-
-    var buttonStyle = function buttonStyle(color) {
-      var buttonColor = buttonColors[color];
-      return {
-        width: '74px',
-        color: '#ffffff',
-        backgroundColor: buttonColor,
-        '&:hover': {
-          backgroundColor: buttonColor
-        },
-        '&:focus': {
-          backgroundColor: buttonColor
-        },
-        fontSize: 12
-      };
-    };
-
-    var IssuesButton = function IssuesButton(_a) {
-      var togglePane = _a.togglePane,
-          sumOfErrors = _a.sumOfErrors;
-      var color = sumOfErrors > 0 ? 'red' : 'green';
-      return /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
-        title: "View details"
-      }, /*#__PURE__*/React__namespace.createElement(material.Chip, {
-        "data-testid": "issuesButton",
-        size: "small",
-        label: getIssuesLabel(sumOfErrors),
-        style: __assign({}, buttonStyle(color)),
-        onClick: togglePane
-      }));
-    };
-
-    var ThumbsUp = function ThumbsUp(props) {
-      return /*#__PURE__*/React__default["default"].createElement(material.SvgIcon, __assign({
-        fontSize: "inherit",
-        viewBox: "0 0 58 69"
-      }, props), /*#__PURE__*/React__default["default"].createElement("title", null, "Thumbs up"), /*#__PURE__*/React__default["default"].createElement("g", {
-        id: "Thumbs-up",
-        stroke: "none",
-        strokeWidth: "1",
-        fill: "none",
-        fillRule: "evenodd"
-      }, /*#__PURE__*/React__default["default"].createElement("path", {
-        d: "M3.99883665,31.7843145 C7.41834232,30.0745617 7.39773108,30.3805485 10.9988366,28.8843145 C14.5999422,27.3880805 16.06167,27.0500418 18.1988366,25.8843145 C19.0904815,25.3979628 19.820202,24.8243341 20.5488366,24.1634286 C20.9845024,23.7682595 22.8819728,21.7794437 23.5488366,20.8277879 C24.2586546,19.8148341 25.1756722,18.5003429 25.9988366,16.8843145 C28.3936103,12.1829184 28.889513,9.4076237 29.8988366,6.88431453 C30.4506375,5.50481234 31.0206747,4.13576029 31.6089482,2.77715837 C31.8562473,2.20602771 32.1648239,1.47549588 32.9988366,0.88431453 C33.2365758,0.715795602 34.0556054,0.253858312 35.0144255,0.0843145301 C36.0262338,-0.0945989315 37.1937102,0.0296108539 37.9980376,0.28431453 C38.7449403,0.520833719 39.4692925,0.860990256 40.1710941,1.30478414 C40.2879689,1.37869154 41.2393256,2.13799569 41.8988366,3.58269657 C42.290748,4.4412034 42.5040976,4.92788584 42.7988366,6.88431453 C42.9953293,8.18860032 43.0453293,9.52193365 42.9488366,10.8843145 C42.947848,11.8251839 42.6645146,13.1585172 42.0988366,14.8843145 C41.9160014,15.4421169 41.6403041,16.2990156 41.2988366,17.1941099 C40.9325633,18.1542284 40.4965053,19.1582935 40.1988366,19.8843145 C39.1594737,22.4193462 37.7498356,25.6900566 37.4561402,26.5124038 C37.2603433,27.0606352 37.1745754,27.6512721 37.1988366,28.2843145 C37.21217,28.4109812 37.2455033,28.5187344 37.2988366,28.6075742 C37.35217,28.6964139 37.45217,28.821994 37.5988366,28.9843145 C38.7401033,28.7100145 39.6802034,28.5266812 40.4191367,28.4343145 C41.6262088,28.2834305 44.7342553,28.0975232 47.4943878,28.1962584 C50.2545202,28.2949937 51.7465936,28.4428269 52.9988366,28.8843145 C53.8336653,29.1786396 54.540332,29.8453063 55.1188366,30.8843145 C55.3507184,31.5616882 55.477385,32.2303996 55.4988366,32.8904489 C55.5202882,33.5504981 55.4369549,34.21512 55.2488366,34.8843145 C54.956044,35.585751 54.5393773,36.1190843 53.9988366,36.4843145 C53.4582959,36.8495447 52.6416293,37.1495447 51.5488366,37.3843145 C51.46217,37.6709812 51.4455033,37.9376479 51.4988366,38.1843145 C51.55217,38.4309812 51.7188366,38.5976479 51.9988366,38.6843145 C53.0027645,38.7154727 53.6750204,38.7821393 54.0156044,38.8843145 C54.7031375,39.0905745 55.3642149,39.4239078 55.9988366,39.8843145 C56.4980387,40.3674862 56.831372,40.7202741 56.9988366,40.9426784 C57.2459451,41.2708552 57.8988366,42.3863253 57.8988366,43.8843145 C57.8988366,44.882974 57.53217,45.882974 56.7988366,46.8843145 C56.4100652,47.2645006 55.9767318,47.5818962 55.4988366,47.8365013 C55.0209415,48.0911064 54.5157721,48.2737108 53.9833285,48.3843145 L52.6988366,48.3843145 C52.2988366,48.6576479 52.0988366,48.9643145 52.0988366,49.3043145 C52.0988366,49.6443145 52.1655033,49.9376479 52.2988366,50.1843145 L53.4440689,50.6343145 C54.0486381,50.9097065 54.566894,51.3263732 54.9988366,51.8843145 C55.2403033,52.1962176 55.7126861,53.1830494 55.7488366,53.8843145 C55.7849872,54.5855797 55.7892838,54.8412841 55.675362,55.3021772 C55.5409724,55.8458769 55.3321306,56.373256 54.9488366,56.8843145 C54.6880408,57.2320423 54.3421972,57.542124 54.0113058,57.8145598 C53.720974,58.0536013 53.0623839,58.3923099 52.0355354,58.6843145 C51.8426264,58.739172 51.4970601,58.8058387 50.9988366,58.8843145 L49.2488366,58.9843145 C48.96217,59.1509812 48.7955033,59.3509812 48.7488366,59.5843145 C48.70217,59.8176479 48.7855033,60.0643145 48.9988366,60.3243145 L50.0168579,60.6843145 C51.0110333,61.2176479 51.5216929,61.9496429 51.5488366,62.8802998 C51.5895523,64.276285 51.475285,65.4556464 50.0016466,66.7843145 C49.4876586,67.2477386 48.8545536,67.4912052 48.1023318,67.7343145 C47.6452927,67.8820242 46.8607943,68.0486909 45.7488366,68.2343145 L40.0010327,68.6843145 C38.1462353,68.7443145 36.81217,68.7776479 35.9988366,68.7843145 C34.7788366,68.7943145 28.6377735,68.7414839 25.3910307,68.5132824 C22.1442879,68.2850808 21.4236621,68.1168902 18.9258088,67.5843145 C16.4279556,67.0517389 16.0894589,66.9976619 13.9988366,66.0843145 C12.6050885,65.4754163 11.2717551,64.6754163 9.99883665,63.6843145 L5.99912679,59.8445931 C5.6005732,59.505994 5.13964906,59.1744645 4.61635438,58.8500046 C3.83141237,58.3633147 3.44878136,58.2942773 2.99883665,57.9843145 C2.44718062,57.6042838 2.05635486,57.1737105 1.71932092,56.7662516 C1.30382099,56.2639309 0.723401214,54.7703696 0.498836646,53.8721113 C0.239479861,52.8346842 0.182966814,51.4491222 0.134208514,50.425802 C0.00166588165,47.644049 0.0975252306,47.2982714 0.0687602378,44.8458357 C0.0452570713,42.8420109 -0.0277106081,40.4082829 0.0112302522,39.9409643 C0.224109489,37.3862585 0.450803729,36.3915418 0.898836646,34.8843145 C1.09883665,34.2114947 1.78104521,33.1945675 2.17275045,32.889441 C2.5644557,32.5843145 3.13875358,32.2143561 3.99883665,31.7843145 Z",
-        id: "Path-2",
-        fill: "#FFBF00"
-      }), /*#__PURE__*/React__default["default"].createElement("path", {
-        d: "M37.1988366,28.2843145 C36.6491114,28.3570112 36.2566531,28.4236779 36.0214618,28.4843145 C35.0603746,28.7321005 34.3937143,29.0314706 34.021481,29.207818 C33.777778,29.3232735 32.5285093,30.04554 31.6988366,30.8956082 C31.0356177,31.5751308 30.7670551,32.3363186 30.5620165,32.9344937 C29.9561734,34.7019667 30.4904911,36.5989836 30.5988366,36.8981554 C30.8174274,37.5017447 31.0945063,37.9694877 31.2988366,38.4843145 C31.4064264,38.7553957 31.4498365,39.7521385 31.3985954,40.9130014 C31.388536,41.1408948 31.3995111,42.8738523 30.5816296,45.1307691 C30.125032,46.3907349 29.4940749,47.743868 28.6988366,48.906031 C27.6082165,50.4998658 26.3589437,51.7345157 26.1988366,51.8770596 C25.2520649,52.7199732 23.8988366,53.516454 23.3777374,54.1031009 C22.8566381,54.6897478 22.8988366,54.7174426 22.8988366,54.8843145 C22.8988366,55.0643438 22.9342857,55.2139882 23.0063234,55.32641 C23.2544011,55.7135594 23.9363916,55.6592779 25.0988366,54.8843145 C25.8683088,54.3713331 26.8213311,53.5952018 27.5988366,52.8259025 C28.3369913,52.0955388 28.9092218,51.3713331 29.2988366,50.8843145 C29.6096134,50.4958436 30.1890589,49.8244169 30.7488366,48.8700346 C31.0160857,48.4143934 31.4327524,47.5858201 31.9988366,46.3843145 C31.9988366,46.7176479 32.33217,47.2176479 32.9988366,47.8843145 C33.1686748,48.0541527 33.5020081,48.3041527 33.9988366,48.6343145 C33.535822,48.6343145 33.2024887,48.6676479 32.9988366,48.7343145 C31.9774176,49.1343145 31.4345654,49.3440777 30.8488366,49.8843145 C30.1709576,50.5095446 29.6310297,51.1756019 29.3988366,52.3843145 C29.1722814,53.5636787 29.3142136,54.632966 29.6488366,55.5921767 C29.928312,56.3933044 30.3156141,57.1176481 30.9865396,57.7652076 C31.1856402,57.9573742 31.5230725,58.2304098 31.9988366,58.5843145 C30.2988366,59.4509812 29.4488366,60.8843145 29.4488366,62.8843145 C29.4488366,65.8843145 31.4988366,68.7843145 35.9988366,68.7843145 C37.2162866,68.7843145 38.5382158,68.7607397 39.9988366,68.6843145 C41.1579568,68.623665 43.0746234,68.473665 45.7488366,68.2343145 C42.81999,68.0652276 40.9033233,67.948561 39.9988366,67.8843145 C38.4397862,67.7735739 34.9576244,67.4218793 34.5109642,67.2843145 C33.8898949,67.0930342 33.3876529,66.66767 32.9988366,66.3843145 C31.7988366,65.509797 31.6488366,63.8668327 31.6488366,63.3843145 C31.6488366,62.6767971 32.115551,61.4820497 32.7124803,60.9291427 C33.2967248,60.387985 34.101504,59.9827037 34.9988366,59.8343145 C36.8129843,59.5343145 37.8279851,59.6343145 38.9968712,59.6343145 C41.8836014,59.6343145 46.4559662,59.9063364 47.0327603,59.9503801 C47.6352731,59.9963876 48.2906319,60.1194654 48.9988366,60.3196132 C48.7881139,60.0647262 48.7047806,59.8196266 48.7488366,59.5843145 C48.7928927,59.3490025 48.9595594,59.1490025 49.2488366,58.9843145 C41.7042463,58.5910176 37.2875796,58.2576842 35.9988366,57.9843145 C34.0657222,57.57426 33.0783849,56.5232188 32.4988366,55.3843145 C32.1808463,54.7594131 31.9988366,54.0680377 32.1988366,52.8843145 C32.4054546,51.661422 33.0758788,51.154421 33.9988366,50.7343145 C35.0343809,50.2629616 36.2160776,50.213626 38.0168693,50.1343145 C41.4226671,49.9843145 41.9988366,49.8715355 44.9988366,49.8843145 C47.4322993,49.8928339 49.8656327,49.9928339 52.2988366,50.1843145 C52.1655033,49.9452767 52.0988366,49.6535253 52.0988366,49.3090604 C52.0988366,48.9645954 52.2988366,48.6563468 52.6988366,48.3843145 C49.4970675,48.4374708 47.2644784,48.4840975 46.0010696,48.5241946 C42.8267531,48.6249387 40.1650305,48.7843145 38.0159019,48.6090596 C36.5073153,48.3843145 35.5349602,47.7454709 35.0988366,47.3586886 C33.5267511,45.9644623 33.6909724,44.1458838 33.6988366,43.902953 C33.7490538,42.3517256 34.2594453,41.6540102 34.9988366,41.2843145 C36.9988366,40.2843145 38.521019,40.3843145 40.9988366,39.8843145 L51.9988366,38.6843145 C51.7847588,38.5992008 51.6347588,38.4325341 51.5488366,38.1843145 C51.4629145,37.9360949 51.4629145,37.6694283 51.5488366,37.3843145 C48.6830402,37.6590904 46.693269,37.8590904 45.579523,37.9843145 C44.2653604,38.1320725 42.7384649,38.3154059 40.9988366,38.5343145 C38.9988366,38.6009812 37.6749072,38.5733169 37.0270482,38.4513217 C35.0988366,38.2216852 33.4888366,37.4843145 33.4388366,34.8545872 C33.3888366,32.7744565 33.7430954,32.2207578 33.8988366,31.9295788 C34.3117653,31.1575537 34.9128559,30.575799 35.3988366,30.1843145 C36.0681111,29.6451768 36.8014444,29.2451768 37.5988366,28.9843145 C37.4503711,28.8228789 37.3503711,28.6970685 37.2988366,28.6068833 C37.2473022,28.516698 37.2139689,28.4091751 37.1988366,28.2843145 Z",
-        id: "Path",
-        fill: "#F28700"
-      })));
-    };
-
     /* *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.
@@ -3358,15 +3308,204 @@
      * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
      * Copyright 2021 - Finnish Meteorological Institute (FMI)
      * */
-    var useStyles$7 = makeStyles__default["default"]({
-      paneContent: {
-        marginTop: '16px',
-        marginLeft: '24px'
-      },
-      image: {
-        fontSize: '4rem'
+    var buttonsStyle = {
+      button: {
+        minWidth: {
+          xs: '56px',
+          sm: '64px'
+        },
+        width: {
+          xs: '56px',
+          sm: '64px'
+        },
+        marginLeft: {
+          xs: 0.5,
+          sm: 1
+        },
+        marginTop: 3,
+        marginBottom: 3
       }
-    });
+    };
+
+    var ViewModeButtons = function ViewModeButtons(_a) {
+      var canBe = _a.canBe,
+          onTafViewModeButtonPress = _a.onTafViewModeButtonPress;
+      return !canBe.includes('CANCELLED') && !canBe.includes('CORRECTED') && !canBe.includes('AMENDED') ? null : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, canBe.includes('CANCELLED') && /*#__PURE__*/React__default["default"].createElement(material.Button, {
+        "data-testid": "canceltaf",
+        variant: "tertiary",
+        onClick: function onClick() {
+          return onTafViewModeButtonPress('CANCEL');
+        }
+      }, "Cancel"), canBe.includes('CORRECTED') && /*#__PURE__*/React__default["default"].createElement(material.Button, {
+        "data-testid": "correctaf",
+        variant: "tertiary",
+        onClick: function onClick() {
+          return onTafViewModeButtonPress('CORRECT');
+        }
+      }, "Correct"), canBe.includes('AMENDED') && /*#__PURE__*/React__default["default"].createElement(material.Button, {
+        "data-testid": "amendtaf",
+        variant: "tertiary",
+        onClick: function onClick() {
+          return onTafViewModeButtonPress('AMEND');
+        }
+      }, "Amend"));
+    };
+
+    var TafFormButtons = function TafFormButtons(_a) {
+      var _b = _a.isFormDisabled,
+          isFormDisabled = _b === void 0 ? false : _b,
+          tafAction = _a.tafAction,
+          _c = _a.canBe,
+          canBe = _c === void 0 ? [] : _c,
+          onTafEditModeButtonPress = _a.onTafEditModeButtonPress,
+          onTafViewModeButtonPress = _a.onTafViewModeButtonPress;
+      return /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        container: true,
+        justifyContent: "flex-end",
+        sx: buttonsStyle,
+        columns: 24
+      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        item: true,
+        container: true,
+        justifyContent: "flex-end",
+        xs: 24,
+        sm: 23
+      }, isFormDisabled ? /*#__PURE__*/React__default["default"].createElement(ViewModeButtons, {
+        canBe: canBe,
+        onTafViewModeButtonPress: onTafViewModeButtonPress
+      }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Button, {
+        "data-testid": "discardtaf",
+        variant: "tertiary",
+        onClick: function onClick() {
+          // Simply discard the changes and close the dialog.
+          onTafEditModeButtonPress('DISCARD');
+        }
+      }, "Discard"), /*#__PURE__*/React__default["default"].createElement(material.Button, {
+        "data-testid": "savedrafttaf",
+        variant: "tertiary",
+        onClick: function onClick() {
+          /* Save the TAF as draft:
+          if action NEW or DRAFT - new status will be DRAFT -- default
+          if action AMEND - new status will be DRAFT_AMENDED
+          if action CORRECT - new status will be DRAFT_CORRECTED
+          if action DRAFT_AMEND - new status will be DRAFT_AMENDED
+          if action DRAFT_CORRECT - new status will be DRAFT_CORRECTED
+          */
+          switch (tafAction) {
+            case 'AMEND':
+            case 'DRAFT_AMEND':
+              onTafEditModeButtonPress('DRAFT_AMEND');
+              break;
+
+            case 'CORRECT':
+            case 'DRAFT_CORRECT':
+              onTafEditModeButtonPress('DRAFT_CORRECT');
+              break;
+
+            default:
+              onTafEditModeButtonPress('DRAFT');
+              break;
+          }
+        }
+      }, "Save"), /*#__PURE__*/React__default["default"].createElement(material.Button, {
+        "data-testid": "publishtaf",
+        variant: "tertiary",
+        onClick: function onClick() {
+          /* Publish the TAF:
+          if action NEW or DRAFT - new status will be PUBLISHED -- default
+          if action AMEND - new status will be AMENDED
+          if action CORRECT - new status will be CORRECTED
+          if action DRAFT_AMEND - new status will be AMENDED
+          if action DRAFT_CORRECT - new status will be CORRECTED
+          */
+          switch (tafAction) {
+            case 'AMEND':
+            case 'DRAFT_AMEND':
+              onTafEditModeButtonPress('AMEND');
+              break;
+
+            case 'CORRECT':
+            case 'DRAFT_CORRECT':
+              onTafEditModeButtonPress('CORRECT');
+              break;
+
+            default:
+              onTafEditModeButtonPress('PUBLISH');
+              break;
+          }
+        }
+      }, "Publish"))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        item: true,
+        sm: 1
+      }));
+    };
+
+    /* *
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2021 - Finnish Meteorological Institute (FMI)
+     * */
+    var useStyles = makeStyles__default["default"](function () {
+      return {
+        dragHandle: {
+          backgroundColor: 'transparent',
+          '&:hover': {
+            backgroundColor: 'transparent'
+          },
+          cursor: function cursor(isSorting) {
+            return isSorting ? 'grabbing' : 'grab';
+          }
+        }
+      };
+    });
+
+    var DragHandle = function DragHandle(_a) {
+      var _b = _a.isSorting,
+          isSorting = _b === void 0 ? false : _b,
+          _c = _a.isDisabled,
+          isDisabled = _c === void 0 ? false : _c,
+          index = _a.index;
+      var classes = useStyles(isSorting);
+      return /*#__PURE__*/React__default["default"].createElement(material.IconButton, {
+        className: classes.dragHandle + " handle",
+        "data-testid": "dragHandle-" + index,
+        disableRipple: true,
+        disabled: isDisabled,
+        size: "large"
+      }, /*#__PURE__*/React__default["default"].createElement(iconsMaterial.DragIndicator, null));
+    };
+
+    var ThumbsUp = function ThumbsUp(props) {
+      return /*#__PURE__*/React__default["default"].createElement(material.SvgIcon, __assign({
+        fontSize: "inherit",
+        viewBox: "0 0 58 69"
+      }, props), /*#__PURE__*/React__default["default"].createElement("title", null, "Thumbs up"), /*#__PURE__*/React__default["default"].createElement("g", {
+        id: "Thumbs-up",
+        stroke: "none",
+        strokeWidth: "1",
+        fill: "none",
+        fillRule: "evenodd"
+      }, /*#__PURE__*/React__default["default"].createElement("path", {
+        d: "M3.99883665,31.7843145 C7.41834232,30.0745617 7.39773108,30.3805485 10.9988366,28.8843145 C14.5999422,27.3880805 16.06167,27.0500418 18.1988366,25.8843145 C19.0904815,25.3979628 19.820202,24.8243341 20.5488366,24.1634286 C20.9845024,23.7682595 22.8819728,21.7794437 23.5488366,20.8277879 C24.2586546,19.8148341 25.1756722,18.5003429 25.9988366,16.8843145 C28.3936103,12.1829184 28.889513,9.4076237 29.8988366,6.88431453 C30.4506375,5.50481234 31.0206747,4.13576029 31.6089482,2.77715837 C31.8562473,2.20602771 32.1648239,1.47549588 32.9988366,0.88431453 C33.2365758,0.715795602 34.0556054,0.253858312 35.0144255,0.0843145301 C36.0262338,-0.0945989315 37.1937102,0.0296108539 37.9980376,0.28431453 C38.7449403,0.520833719 39.4692925,0.860990256 40.1710941,1.30478414 C40.2879689,1.37869154 41.2393256,2.13799569 41.8988366,3.58269657 C42.290748,4.4412034 42.5040976,4.92788584 42.7988366,6.88431453 C42.9953293,8.18860032 43.0453293,9.52193365 42.9488366,10.8843145 C42.947848,11.8251839 42.6645146,13.1585172 42.0988366,14.8843145 C41.9160014,15.4421169 41.6403041,16.2990156 41.2988366,17.1941099 C40.9325633,18.1542284 40.4965053,19.1582935 40.1988366,19.8843145 C39.1594737,22.4193462 37.7498356,25.6900566 37.4561402,26.5124038 C37.2603433,27.0606352 37.1745754,27.6512721 37.1988366,28.2843145 C37.21217,28.4109812 37.2455033,28.5187344 37.2988366,28.6075742 C37.35217,28.6964139 37.45217,28.821994 37.5988366,28.9843145 C38.7401033,28.7100145 39.6802034,28.5266812 40.4191367,28.4343145 C41.6262088,28.2834305 44.7342553,28.0975232 47.4943878,28.1962584 C50.2545202,28.2949937 51.7465936,28.4428269 52.9988366,28.8843145 C53.8336653,29.1786396 54.540332,29.8453063 55.1188366,30.8843145 C55.3507184,31.5616882 55.477385,32.2303996 55.4988366,32.8904489 C55.5202882,33.5504981 55.4369549,34.21512 55.2488366,34.8843145 C54.956044,35.585751 54.5393773,36.1190843 53.9988366,36.4843145 C53.4582959,36.8495447 52.6416293,37.1495447 51.5488366,37.3843145 C51.46217,37.6709812 51.4455033,37.9376479 51.4988366,38.1843145 C51.55217,38.4309812 51.7188366,38.5976479 51.9988366,38.6843145 C53.0027645,38.7154727 53.6750204,38.7821393 54.0156044,38.8843145 C54.7031375,39.0905745 55.3642149,39.4239078 55.9988366,39.8843145 C56.4980387,40.3674862 56.831372,40.7202741 56.9988366,40.9426784 C57.2459451,41.2708552 57.8988366,42.3863253 57.8988366,43.8843145 C57.8988366,44.882974 57.53217,45.882974 56.7988366,46.8843145 C56.4100652,47.2645006 55.9767318,47.5818962 55.4988366,47.8365013 C55.0209415,48.0911064 54.5157721,48.2737108 53.9833285,48.3843145 L52.6988366,48.3843145 C52.2988366,48.6576479 52.0988366,48.9643145 52.0988366,49.3043145 C52.0988366,49.6443145 52.1655033,49.9376479 52.2988366,50.1843145 L53.4440689,50.6343145 C54.0486381,50.9097065 54.566894,51.3263732 54.9988366,51.8843145 C55.2403033,52.1962176 55.7126861,53.1830494 55.7488366,53.8843145 C55.7849872,54.5855797 55.7892838,54.8412841 55.675362,55.3021772 C55.5409724,55.8458769 55.3321306,56.373256 54.9488366,56.8843145 C54.6880408,57.2320423 54.3421972,57.542124 54.0113058,57.8145598 C53.720974,58.0536013 53.0623839,58.3923099 52.0355354,58.6843145 C51.8426264,58.739172 51.4970601,58.8058387 50.9988366,58.8843145 L49.2488366,58.9843145 C48.96217,59.1509812 48.7955033,59.3509812 48.7488366,59.5843145 C48.70217,59.8176479 48.7855033,60.0643145 48.9988366,60.3243145 L50.0168579,60.6843145 C51.0110333,61.2176479 51.5216929,61.9496429 51.5488366,62.8802998 C51.5895523,64.276285 51.475285,65.4556464 50.0016466,66.7843145 C49.4876586,67.2477386 48.8545536,67.4912052 48.1023318,67.7343145 C47.6452927,67.8820242 46.8607943,68.0486909 45.7488366,68.2343145 L40.0010327,68.6843145 C38.1462353,68.7443145 36.81217,68.7776479 35.9988366,68.7843145 C34.7788366,68.7943145 28.6377735,68.7414839 25.3910307,68.5132824 C22.1442879,68.2850808 21.4236621,68.1168902 18.9258088,67.5843145 C16.4279556,67.0517389 16.0894589,66.9976619 13.9988366,66.0843145 C12.6050885,65.4754163 11.2717551,64.6754163 9.99883665,63.6843145 L5.99912679,59.8445931 C5.6005732,59.505994 5.13964906,59.1744645 4.61635438,58.8500046 C3.83141237,58.3633147 3.44878136,58.2942773 2.99883665,57.9843145 C2.44718062,57.6042838 2.05635486,57.1737105 1.71932092,56.7662516 C1.30382099,56.2639309 0.723401214,54.7703696 0.498836646,53.8721113 C0.239479861,52.8346842 0.182966814,51.4491222 0.134208514,50.425802 C0.00166588165,47.644049 0.0975252306,47.2982714 0.0687602378,44.8458357 C0.0452570713,42.8420109 -0.0277106081,40.4082829 0.0112302522,39.9409643 C0.224109489,37.3862585 0.450803729,36.3915418 0.898836646,34.8843145 C1.09883665,34.2114947 1.78104521,33.1945675 2.17275045,32.889441 C2.5644557,32.5843145 3.13875358,32.2143561 3.99883665,31.7843145 Z",
+        id: "Path-2",
+        fill: "#FFBF00"
+      }), /*#__PURE__*/React__default["default"].createElement("path", {
+        d: "M37.1988366,28.2843145 C36.6491114,28.3570112 36.2566531,28.4236779 36.0214618,28.4843145 C35.0603746,28.7321005 34.3937143,29.0314706 34.021481,29.207818 C33.777778,29.3232735 32.5285093,30.04554 31.6988366,30.8956082 C31.0356177,31.5751308 30.7670551,32.3363186 30.5620165,32.9344937 C29.9561734,34.7019667 30.4904911,36.5989836 30.5988366,36.8981554 C30.8174274,37.5017447 31.0945063,37.9694877 31.2988366,38.4843145 C31.4064264,38.7553957 31.4498365,39.7521385 31.3985954,40.9130014 C31.388536,41.1408948 31.3995111,42.8738523 30.5816296,45.1307691 C30.125032,46.3907349 29.4940749,47.743868 28.6988366,48.906031 C27.6082165,50.4998658 26.3589437,51.7345157 26.1988366,51.8770596 C25.2520649,52.7199732 23.8988366,53.516454 23.3777374,54.1031009 C22.8566381,54.6897478 22.8988366,54.7174426 22.8988366,54.8843145 C22.8988366,55.0643438 22.9342857,55.2139882 23.0063234,55.32641 C23.2544011,55.7135594 23.9363916,55.6592779 25.0988366,54.8843145 C25.8683088,54.3713331 26.8213311,53.5952018 27.5988366,52.8259025 C28.3369913,52.0955388 28.9092218,51.3713331 29.2988366,50.8843145 C29.6096134,50.4958436 30.1890589,49.8244169 30.7488366,48.8700346 C31.0160857,48.4143934 31.4327524,47.5858201 31.9988366,46.3843145 C31.9988366,46.7176479 32.33217,47.2176479 32.9988366,47.8843145 C33.1686748,48.0541527 33.5020081,48.3041527 33.9988366,48.6343145 C33.535822,48.6343145 33.2024887,48.6676479 32.9988366,48.7343145 C31.9774176,49.1343145 31.4345654,49.3440777 30.8488366,49.8843145 C30.1709576,50.5095446 29.6310297,51.1756019 29.3988366,52.3843145 C29.1722814,53.5636787 29.3142136,54.632966 29.6488366,55.5921767 C29.928312,56.3933044 30.3156141,57.1176481 30.9865396,57.7652076 C31.1856402,57.9573742 31.5230725,58.2304098 31.9988366,58.5843145 C30.2988366,59.4509812 29.4488366,60.8843145 29.4488366,62.8843145 C29.4488366,65.8843145 31.4988366,68.7843145 35.9988366,68.7843145 C37.2162866,68.7843145 38.5382158,68.7607397 39.9988366,68.6843145 C41.1579568,68.623665 43.0746234,68.473665 45.7488366,68.2343145 C42.81999,68.0652276 40.9033233,67.948561 39.9988366,67.8843145 C38.4397862,67.7735739 34.9576244,67.4218793 34.5109642,67.2843145 C33.8898949,67.0930342 33.3876529,66.66767 32.9988366,66.3843145 C31.7988366,65.509797 31.6488366,63.8668327 31.6488366,63.3843145 C31.6488366,62.6767971 32.115551,61.4820497 32.7124803,60.9291427 C33.2967248,60.387985 34.101504,59.9827037 34.9988366,59.8343145 C36.8129843,59.5343145 37.8279851,59.6343145 38.9968712,59.6343145 C41.8836014,59.6343145 46.4559662,59.9063364 47.0327603,59.9503801 C47.6352731,59.9963876 48.2906319,60.1194654 48.9988366,60.3196132 C48.7881139,60.0647262 48.7047806,59.8196266 48.7488366,59.5843145 C48.7928927,59.3490025 48.9595594,59.1490025 49.2488366,58.9843145 C41.7042463,58.5910176 37.2875796,58.2576842 35.9988366,57.9843145 C34.0657222,57.57426 33.0783849,56.5232188 32.4988366,55.3843145 C32.1808463,54.7594131 31.9988366,54.0680377 32.1988366,52.8843145 C32.4054546,51.661422 33.0758788,51.154421 33.9988366,50.7343145 C35.0343809,50.2629616 36.2160776,50.213626 38.0168693,50.1343145 C41.4226671,49.9843145 41.9988366,49.8715355 44.9988366,49.8843145 C47.4322993,49.8928339 49.8656327,49.9928339 52.2988366,50.1843145 C52.1655033,49.9452767 52.0988366,49.6535253 52.0988366,49.3090604 C52.0988366,48.9645954 52.2988366,48.6563468 52.6988366,48.3843145 C49.4970675,48.4374708 47.2644784,48.4840975 46.0010696,48.5241946 C42.8267531,48.6249387 40.1650305,48.7843145 38.0159019,48.6090596 C36.5073153,48.3843145 35.5349602,47.7454709 35.0988366,47.3586886 C33.5267511,45.9644623 33.6909724,44.1458838 33.6988366,43.902953 C33.7490538,42.3517256 34.2594453,41.6540102 34.9988366,41.2843145 C36.9988366,40.2843145 38.521019,40.3843145 40.9988366,39.8843145 L51.9988366,38.6843145 C51.7847588,38.5992008 51.6347588,38.4325341 51.5488366,38.1843145 C51.4629145,37.9360949 51.4629145,37.6694283 51.5488366,37.3843145 C48.6830402,37.6590904 46.693269,37.8590904 45.579523,37.9843145 C44.2653604,38.1320725 42.7384649,38.3154059 40.9988366,38.5343145 C38.9988366,38.6009812 37.6749072,38.5733169 37.0270482,38.4513217 C35.0988366,38.2216852 33.4888366,37.4843145 33.4388366,34.8545872 C33.3888366,32.7744565 33.7430954,32.2207578 33.8988366,31.9295788 C34.3117653,31.1575537 34.9128559,30.575799 35.3988366,30.1843145 C36.0681111,29.6451768 36.8014444,29.2451768 37.5988366,28.9843145 C37.4503711,28.8228789 37.3503711,28.6970685 37.2988366,28.6068833 C37.2473022,28.516698 37.2139689,28.4091751 37.1988366,28.2843145 Z",
+        id: "Path",
+        fill: "#F28700"
+      })));
+    };
 
     var getPaneTitle = function getPaneTitle(sumOfErrors) {
       switch (sumOfErrors) {
@@ -3406,7 +3545,7 @@
       var nameWithoutBrackets = nameAsString.replace(/[[\]']+/g, '');
       var nameLowerCase = nameWithoutBrackets.toLowerCase();
 
-      var _a = __read(nameLowerCase.split(/([0-9]+)/) // split numbers from field and build array
+      var _a = __read(nameLowerCase.split(/([0-9]+)/) // split num bers from field and build array
       .filter(function (s) {
         return s.length;
       }), 2),
@@ -3432,33 +3571,43 @@
       var fieldErrorTitle = humanizeErrorMessage(firstNamePart);
       return index + 1 + ". " + fieldErrorTitle + ": " + getErrorDefaultMessage(error);
     };
+    var MODAL_DIALOG_ELEMENT = 'modal-dialog';
 
     var IssuesPane = function IssuesPane(_a) {
       var isOpen = _a.isOpen,
           handleClose = _a.handleClose,
           _b = _a.errorList,
-          errorList = _b === void 0 ? [] : _b;
-      var classes = useStyles$7();
-      return /*#__PURE__*/React__namespace.createElement(shared.ToolContainerDraggable, {
+          errorList = _b === void 0 ? [] : _b,
+          _c = _a.startPosition,
+          startPosition = _c === void 0 ? {
+        left: 20,
+        top: 50
+      } : _c;
+      var rootElement = document.getElementById(MODAL_DIALOG_ELEMENT) || document.body;
+      return /*#__PURE__*/ReactDOM__default["default"].createPortal( /*#__PURE__*/React__namespace.createElement(shared.ToolContainerDraggable, {
         startSize: {
           width: '577px',
           height: '200px'
         },
-        startPosition: {
-          right: 20,
-          top: 50
-        },
+        startPosition: startPosition,
         minWidth: 300,
         onClose: handleClose,
         title: getPaneTitle(errorList.length),
         headerSize: "xs",
         isOpen: isOpen,
         "data-testid": "moveable-issues-pane",
-        bounds: "body"
-      }, /*#__PURE__*/React__namespace.createElement("div", {
-        className: classes.paneContent
-      }, errorList.length === 0 && /*#__PURE__*/React__namespace.createElement("div", {
-        className: classes.image,
+        bounds: "parent"
+      }, /*#__PURE__*/React__namespace.createElement(material.Box, {
+        component: "div",
+        sx: {
+          marginTop: '16px',
+          marginLeft: '24px'
+        }
+      }, errorList.length === 0 && /*#__PURE__*/React__namespace.createElement(material.Box, {
+        component: "div",
+        sx: {
+          fontSize: '4rem'
+        },
         "data-testid": "zeroIssuesImage"
       }, /*#__PURE__*/React__namespace.createElement(ThumbsUp, null)), errorList.length > 0 && errorList.map(function (error, index) {
         return /*#__PURE__*/React__namespace.createElement(material.Typography // eslint-disable-next-line react/no-array-index-key
@@ -3468,7 +3617,7 @@
           variant: "body1",
           "data-testid": "errorMessage"
         }, getErrorMessage(error, index));
-      })));
+      }))), rootElement);
     };
 
     var getCustomError = function getCustomError(error) {
@@ -3482,6 +3631,19 @@
       });
     };
 
+    var getIssuesLabel = function getIssuesLabel(sumOfErrors) {
+      switch (sumOfErrors) {
+        case 0:
+          return '0 issues';
+
+        case 1:
+          return '1 issue';
+
+        default:
+          return sumOfErrors + " issues";
+      }
+    };
+
     var getErrorValues = function getErrorValues(fieldErrors) {
       if (!fieldErrors) return [];
       return Object.keys(fieldErrors).reduce(function (list, key) {
@@ -3495,22 +3657,6 @@
       }, []);
     };
 
-    var getErrors = function getErrors(errors) {
-      var errorList = Object.keys(errors).reduce(function (list, key) {
-        var errorValue = errors[key];
-
-        if (Array.isArray(errorValue)) {
-          var errorValues = errorValue.reduce(function (l, i) {
-            return l.concat(getErrorValues(i));
-          }, []);
-          return list.concat.apply(list, __spreadArray([], __read(errorValues)));
-        }
-
-        return list.concat(getErrorValues(errorValue));
-      }, []);
-      return errorList;
-    };
-
     var filterDuplicateErrors = function filterDuplicateErrors(errors) {
       return errors.reduce(function (list, error) {
         // check on type validateRequiredSub and validateRequiredMainOptional since these are giving 'duplicates'
@@ -3532,237 +3678,98 @@
       }, []);
     };
 
-    var TafFormButtons = function TafFormButtons(_a) {
-      var tafAction = _a.tafAction,
-          onTafFormButtonPress = _a.onTafFormButtonPress;
-      var errors = reactHookForm.useFormContext().errors;
+    var getErrors = function getErrors(errors) {
+      var errorList = Object.keys(errors).reduce(function (list, key) {
+        var errorValue = errors[key];
+
+        if (Array.isArray(errorValue)) {
+          var errorValues = errorValue.reduce(function (l, i) {
+            return l.concat(getErrorValues(i));
+          }, []);
+          return list.concat.apply(list, __spreadArray([], __read(errorValues)));
+        }
+
+        return list.concat(getErrorValues(errorValue));
+      }, []);
+      return errorList;
+    };
+
+    var IssuesButton = function IssuesButton(_a) {
+      var _b = _a.errors,
+          errors = _b === void 0 ? {} : _b;
       var errorList = filterDuplicateErrors(getErrors(errors));
+      var totalErrors = errorList.length;
+      var errorStatus = totalErrors > 0 ? 'error' : 'success';
+      var buttonColor = "geowebColors.functional." + errorStatus;
 
-      var _b = __read(React__default["default"].useState(false), 2),
-          isIssuesPaneOpen = _b[0],
-          setIsIssuesPaneOpen = _b[1];
+      var _c = __read(React__namespace.useState(false), 2),
+          isIssuesPaneOpen = _c[0],
+          setIsIssuesPaneOpen = _c[1];
 
       var toggleIssuesPane = function toggleIssuesPane() {
         return setIsIssuesPaneOpen(!isIssuesPaneOpen);
       };
 
-      return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        container: true,
-        justifyContent: "space-between",
-        alignItems: "center",
-        sx: {
-          margin: '10px 0px 22px 0px'
-        }
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true
-      }, /*#__PURE__*/React__default["default"].createElement(IssuesButton, {
-        sumOfErrors: errorList.length,
-        togglePane: toggleIssuesPane
-      }))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        container: true,
-        justifyContent: "flex-end",
-        sx: {
-          paddingRight: '28px'
-        }
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true
-      }, /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        "data-testid": "discardtaf",
-        variant: "tertiary",
-        onClick: function onClick() {
-          // Simply discard the changes and close the dialog.
-          onTafFormButtonPress('DISCARD');
-        }
-      }, "Discard"), /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        "data-testid": "savedrafttaf",
-        variant: "tertiary",
-        sx: {
-          margin: '0px 10px'
-        },
-        onClick: function onClick() {
-          /* Save the TAF as draft:
-          if action NEW or DRAFT - new status will be DRAFT -- default
-          if action AMEND - new status will be DRAFT_AMENDED
-          if action CORRECT - new status will be DRAFT_CORRECTED
-          if action DRAFT_AMEND - new status will be DRAFT_AMENDED
-          if action DRAFT_CORRECT - new status will be DRAFT_CORRECTED
-          */
-          switch (tafAction) {
-            case 'AMEND':
-            case 'DRAFT_AMEND':
-              onTafFormButtonPress('DRAFT_AMEND');
-              break;
+      var _d = __read(React__namespace.useState({
+        left: 0,
+        top: 0
+      }), 2),
+          startPosition = _d[0],
+          setStartPosition = _d[1];
 
-            case 'CORRECT':
-            case 'DRAFT_CORRECT':
-              onTafFormButtonPress('DRAFT_CORRECT');
-              break;
+      var onClickButton = function onClickButton(event) {
+        var _a;
 
-            default:
-              onTafFormButtonPress('DRAFT');
-              break;
-          }
-        }
-      }, "Save"), /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        "data-testid": "publishtaf",
-        variant: "tertiary",
-        onClick: function onClick() {
-          /* Publish the TAF:
-          if action NEW or DRAFT - new status will be PUBLISHED -- default
-          if action AMEND - new status will be AMENDED
-          if action CORRECT - new status will be CORRECTED
-          if action DRAFT_AMEND - new status will be AMENDED
-          if action DRAFT_CORRECT - new status will be CORRECTED
-          */
-          switch (tafAction) {
-            case 'AMEND':
-            case 'DRAFT_AMEND':
-              onTafFormButtonPress('AMEND');
-              break;
+        var _b = event.currentTarget.getBoundingClientRect(),
+            left = _b.left,
+            top = _b.top;
 
-            case 'CORRECT':
-            case 'DRAFT_CORRECT':
-              onTafFormButtonPress('CORRECT');
-              break;
+        var parentOffset = ((_a = document.getElementById('tafmodule')) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect()) || {
+          top: 0,
+          left: 0
+        };
+        var newPosition = {
+          left: left - parentOffset.left + 100,
+          top: top - parentOffset.top
+        };
+        setStartPosition(newPosition);
+        toggleIssuesPane();
+      };
 
-            default:
-              onTafFormButtonPress('PUBLISH');
-              break;
-          }
+      return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(material.Tooltip, {
+        title: "View details"
+      }, /*#__PURE__*/React__namespace.createElement(material.Chip, {
+        "data-testid": "issuesButton",
+        className: "status-" + errorStatus,
+        size: "small",
+        label: getIssuesLabel(totalErrors),
+        onClick: onClickButton,
+        sx: {
+          width: '74px',
+          color: '#ffffff',
+          backgroundColor: buttonColor,
+          '&:hover': {
+            backgroundColor: buttonColor
+          },
+          '&:focus': {
+            backgroundColor: buttonColor
+          },
+          fontSize: 12
         }
-      }, "Publish"))), /*#__PURE__*/React__default["default"].createElement(IssuesPane, {
+      })), /*#__PURE__*/React__namespace.createElement(IssuesPane, {
         errorList: errorList,
         handleClose: toggleIssuesPane,
-        isOpen: isIssuesPaneOpen
+        isOpen: isIssuesPaneOpen,
+        startPosition: startPosition
       }));
     };
 
-    /* *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
-     * */
-    var useStyles$6 = makeStyles__default["default"](function () {
-      return {
-        dragHandle: {
-          backgroundColor: 'transparent',
-          '&:hover': {
-            backgroundColor: 'transparent'
-          },
-          cursor: function cursor(isSorting) {
-            return isSorting ? 'grabbing' : 'grab';
-          }
-        }
-      };
-    });
-
-    var DragHandle = function DragHandle(_a) {
-      var _b = _a.isSorting,
-          isSorting = _b === void 0 ? false : _b,
-          _c = _a.isDisabled,
-          isDisabled = _c === void 0 ? false : _c,
-          index = _a.index;
-      var classes = useStyles$6(isSorting);
-      return /*#__PURE__*/React__default["default"].createElement(material.IconButton, {
-        className: classes.dragHandle + " handle",
-        "data-testid": "dragHandle-" + index,
-        disableRipple: true,
-        disabled: isDisabled,
-        size: "large"
-      }, /*#__PURE__*/React__default["default"].createElement(iconsMaterial.DragIndicator, null));
-    };
-
-    /* *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
-     * */
-
-    var TafListButtons = function TafListButtons(_a) {
-      var uuid = _a.uuid,
-          canBe = _a.canBe,
-          onClickTafActionButton = _a.onClickTafActionButton,
-          _b = _a.testId,
-          testId = _b === void 0 ? 'taflist-canbebuttons' : _b;
-      return !canBe.includes('CANCELLED') && !canBe.includes('CORRECTED') && !canBe.includes('AMENDED') ? null : /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        container: true,
-        justifyContent: "flex-end",
-        alignItems: "center",
-        "data-testid": testId,
-        sx: {
-          margin: '10px 0px 22px 0px',
-          paddingRight: '28px'
-        }
-      }, canBe.includes('CANCELLED') && /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        "data-testid": "canceltaf",
-        variant: "tertiary",
-        onClick: function onClick() {
-          return onClickTafActionButton('CANCEL', uuid);
-        }
-      }, "Cancel"), canBe.includes('CORRECTED') && /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        "data-testid": "correctaf",
-        variant: "tertiary",
-        sx: {
-          margin: '0px 10px'
-        },
-        onClick: function onClick() {
-          return onClickTafActionButton('CORRECT', uuid);
-        }
-      }, "Correct"), canBe.includes('AMENDED') && /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        "data-testid": "amendtaf",
-        variant: "tertiary",
-        onClick: function onClick() {
-          return onClickTafActionButton('AMEND', uuid);
-        }
-      }, "Amend"));
-    };
-
     var noop = function noop() {};
 
-    var emptyChangegroup = {
-      valid: '',
-      wind: '',
-      visibility: '',
-      weather: {
-        weather1: null,
-        weather2: null,
-        weather3: null
-      },
-      cloud: {
-        cloud1: null,
-        cloud2: null,
-        cloud3: null,
-        cloud4: null
-      },
-      change: null,
-      probability: null
-    };
-
     var TafForm = function TafForm(_a) {
-      var isDisabled = _a.isDisabled,
-          tafAction = _a.tafAction,
+      var // can be removed after old TAF is gone
+      defaultTafAction = _a.tafAction,
+          isDefaultDisabled = _a.isDisabled,
           _b = _a.staticTAC,
           staticTAC = _b === void 0 ? '' : _b,
           tafFromBackend = _a.tafFromBackend,
@@ -3771,36 +3778,46 @@
         return null;
       } : _c;
       var originalTaf = tafFromBackend.taf;
+
+      var _d = __read(React__default["default"].useState(defaultTafAction), 2),
+          tafAction = _d[0],
+          setTafAction = _d[1];
+
+      var _e = __read(React__default["default"].useState(isDefaultDisabled), 2),
+          isDisabled = _e[0],
+          setIsDisabled = _e[1];
+
       var confirmDialog = shared.useConfirmationDialog();
 
-      var _d = shared.useDraftFormHelpers(),
-          toggleIsDraft = _d.toggleIsDraft,
-          DraftFieldHelper = _d.DraftFieldHelper;
+      var _f = shared.useDraftFormHelpers(),
+          toggleIsDraft = _f.toggleIsDraft,
+          DraftFieldHelper = _f.DraftFieldHelper;
 
       var api$1 = api.useApiContext().api;
       var isMounted = shared.useIsMounted().isMounted;
 
-      var _e = reactHookForm.useFormContext(),
-          control = _e.control,
-          handleSubmit = _e.handleSubmit,
-          watch = _e.watch,
-          trigger = _e.trigger,
-          formState = _e.formState,
-          getValues = _e.getValues,
-          setValue = _e.setValue;
+      var _g = reactHookForm.useFormContext(),
+          control = _g.control,
+          handleSubmit = _g.handleSubmit,
+          watch = _g.watch,
+          trigger = _g.trigger,
+          formState = _g.formState,
+          getValues = _g.getValues,
+          setValue = _g.setValue,
+          reset = _g.reset;
 
       var isFormDirty = formState.isDirty,
           errors = formState.errors;
       shared.usePreventBrowserClose(isFormDirty && !isDisabled);
       var hiddenInputFields = ['baseTime', 'issueDate', 'type', 'uuid', 'validDateStart', 'validDateEnd', 'status', 'previousId', 'previousValidDateStart', 'previousValidDateEnd'];
 
-      var _f = __read(React__default["default"].useState(watch()), 2),
-          delayedFormValues = _f[0],
-          setDelayedFormValues = _f[1];
+      var _h = __read(React__default["default"].useState(watch()), 2),
+          delayedFormValues = _h[0],
+          setDelayedFormValues = _h[1];
 
-      var _g = __read(useTACGenerator(convertTafValuesToObject(delayedFormValues), api$1.getTAC, staticTAC), 2),
-          TAC = _g[0],
-          updateTAC = _g[1];
+      var _j = __read(useTACGenerator(convertTafValuesToObject(delayedFormValues), api$1.getTAC, staticTAC), 2),
+          TAC = _j[0],
+          updateTAC = _j[1];
 
       var hasErrors = Object.keys(errors).length;
 
@@ -3838,7 +3855,27 @@
         });
       };
 
-      var onTafButtonPress = function onTafButtonPress(action) {
+      var resetFormValues = function resetFormValues(action, shouldAddEmptyChangGroup) {
+        if (action === void 0) {
+          action = undefined;
+        }
+
+        var newTaf = prepareTafValues(tafFromBackend.taf, action, shouldAddEmptyChangGroup);
+        reset(newTaf);
+      };
+
+      var resetForm = function resetForm(action, resetDisabled) {
+        if (action === void 0) {
+          action = undefined;
+        }
+
+        var shouldAddEmptyChangGroup = !(tafFromBackend.taf && tafFromBackend.taf.changeGroups) && !resetDisabled;
+        resetFormValues(action, shouldAddEmptyChangGroup);
+        setIsDisabled(resetDisabled);
+        setTafAction(action);
+      };
+
+      var onTafEditModeButtonPress = function onTafEditModeButtonPress(action) {
         switch (action) {
           case 'DRAFT':
           case 'DRAFT_AMEND':
@@ -3852,10 +3889,10 @@
           case 'DISCARD':
             if (isFormDirty) {
               showConfirmDialog(action).then(function () {
-                onFormAction(action);
+                resetForm(undefined, isDefaultDisabled);
               });
             } else {
-              onFormAction(action);
+              resetForm(undefined, isDefaultDisabled);
             }
 
             break;
@@ -3865,8 +3902,36 @@
           case 'PUBLISH':
             toggleIsDraft(false);
             handleSubmit(function (data) {
-              showConfirmDialog(action).then(function () {
-                onFormAction(action, convertTafValuesToObject(data));
+              return __awaiter(void 0, void 0, void 0, function () {
+                var didSucceed;
+                return __generator(this, function (_a) {
+                  switch (_a.label) {
+                    case 0:
+                      return [4
+                      /*yield*/
+                      , showConfirmDialog(action)];
+
+                    case 1:
+                      _a.sent();
+
+                      return [4
+                      /*yield*/
+                      , onFormAction(action, convertTafValuesToObject(data))];
+
+                    case 2:
+                      didSucceed = _a.sent();
+
+                      if (didSucceed) {
+                        setIsDisabled(true);
+                        reset(prepareTafValues(convertTafValuesToObject(data), action, false));
+                        setTafAction(null);
+                      }
+
+                      return [2
+                      /*return*/
+                      ];
+                  }
+                });
               });
             })();
             break;
@@ -3875,30 +3940,35 @@
             onFormAction(action);
             break;
         }
-      }; // TODO: https://gitlab.com/opengeoweb/opengeoweb/-/issues/1906 hookup actions
-
+      };
 
       var onTafViewModeButtonPress = function onTafViewModeButtonPress(action) {
         switch (action) {
+          case 'CANCEL':
+            showConfirmDialog(action).then(function () {
+              onFormAction(action, tafFromBackend.taf);
+            });
+            break;
+
           default:
-            onFormAction(action);
+            resetForm(action, false);
             break;
         }
       };
 
-      var _h = reactHookForm.useFieldArray({
+      var _k = reactHookForm.useFieldArray({
         control: control,
         name: 'changeGroups'
       }),
-          fields = _h.fields,
-          insert = _h.insert,
-          remove = _h.remove,
-          move = _h.move;
+          fields = _k.fields,
+          insert = _k.insert,
+          remove = _k.remove,
+          move = _k.move;
 
-      var _j = useDragOrder(trigger, move, onFormBlur),
-          onChangeOrder = _j.onChangeOrder,
-          onStartDrag = _j.onStartDrag,
-          activeDraggingIndex = _j.activeDraggingIndex;
+      var _l = useDragOrder(trigger, move, onFormBlur),
+          onChangeOrder = _l.onChangeOrder,
+          onStartDrag = _l.onStartDrag,
+          activeDraggingIndex = _l.activeDraggingIndex;
 
       var onRemoverow = function onRemoverow(index) {
         confirmDialog({
@@ -3996,7 +4066,8 @@
       }, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
         sx: {
           fontSize: '20px',
-          fontWeight: 500
+          fontWeight: 500,
+          height: '24px'
         }
       }, "TAC"), /*#__PURE__*/React__default["default"].createElement(material.Typography, {
         sx: {
@@ -4011,7 +4082,8 @@
           "data-testid": "tafform-tac-message-line",
           sx: {
             textIndent: '-0.7em',
-            borderRadius: '3px'
+            borderRadius: '3px',
+            paddingRight: '0.7em'
           }
         }, line);
       })), /*#__PURE__*/React__default["default"].createElement(TafFormRow, {
@@ -4053,15 +4125,24 @@
             index: index
           })
         });
-      })), // TODO: these buttons should be combined, and the Issuesbuton should be separate
-      !isDisabled ? /*#__PURE__*/React__default["default"].createElement(TafFormButtons, {
+      })), !isDisabled && /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        container: true,
+        justifyContent: "space-between",
+        alignItems: "center",
+        sx: {
+          marginLeft: 1.5,
+          marginTop: 1
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        item: true
+      }, /*#__PURE__*/React__default["default"].createElement(IssuesButton, {
+        errors: errors
+      }))), /*#__PURE__*/React__default["default"].createElement(TafFormButtons, {
+        isFormDisabled: isDisabled,
         tafAction: tafAction,
-        onTafFormButtonPress: onTafButtonPress
-      }) : /*#__PURE__*/React__default["default"].createElement(TafListButtons, {
-        uuid: originalTaf.uuid,
         canBe: tafFromBackend.canbe,
-        onClickTafActionButton: onTafViewModeButtonPress,
-        testId: "newtaflist-canbebuttons"
+        onTafEditModeButtonPress: onTafEditModeButtonPress,
+        onTafViewModeButtonPress: onTafViewModeButtonPress
       }), hiddenInputFields.map(function (field) {
         return /*#__PURE__*/React__default["default"].createElement(formFields.ReactHookFormHiddenInput, {
           name: field,
@@ -4070,72 +4151,33 @@
       }), /*#__PURE__*/React__default["default"].createElement(DraftFieldHelper, null));
     };
 
-    var getMessageType = function getMessageType(taf, tafAction) {
-      if (tafAction === 'CORRECT') {
-        return 'COR';
-      }
-
-      if (tafAction === 'AMEND') {
-        return 'AMD';
-      }
-
-      return taf.messageType;
-    }; // For corrections and amendment we need to add the previousValidStart and End for the TAC converter
-
-    var getAmendedCorrectedTafTimes = function getAmendedCorrectedTafTimes(taf, tafAction) {
-      var previousValidDateStart = taf.previousValidDateStart && tafAction !== 'AMEND' ? taf.previousValidDateStart : taf.validDateStart;
-      var previousValidDateEnd = taf.previousValidDateEnd && tafAction !== 'AMEND' ? taf.previousValidDateEnd : taf.validDateEnd; // For amendment change valid start time to current time
-      // only do this if we're already within the validity period
-
-      if ((tafAction === 'AMEND' || tafAction === 'DRAFT_AMEND') && moment__default["default"].utc() >= moment__default["default"].utc(taf.validDateStart)) {
-        var now = moment__default["default"].utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
-        var validObj = {
-          start: now,
-          end: taf.baseForecast.valid.end
-        };
-        return __assign(__assign({}, taf), {
-          previousValidDateStart: previousValidDateStart,
-          previousValidDateEnd: previousValidDateEnd,
-          validDateStart: now,
-          baseForecast: __assign(__assign({}, taf.baseForecast), {
-            valid: validObj
-          })
-        });
-      }
-
-      return __assign(__assign({}, taf), {
-        previousValidDateStart: previousValidDateStart,
-        previousValidDateEnd: previousValidDateEnd
-      });
-    };
-    var prepareTafValues = function prepareTafValues(_taf, tafAction, addEmptyChangeGroup) {
-      if (addEmptyChangeGroup === void 0) {
-        addEmptyChangeGroup = false;
-      } // If action is AMEND/CORRECT/DRAFT_AMEND/DRAFT_CORRECTION - add previous valid start and end
-      // If action is AMEND/DRAFT_AMEND - update validity start time to current time
-
-
-      var taf = tafAction === 'AMEND' || tafAction === 'DRAFT_AMEND' || tafAction === 'CORRECT' || tafAction === 'DRAFT_CORRECT' ? getAmendedCorrectedTafTimes(_taf, tafAction) : _taf;
-      return __assign(__assign(__assign(__assign({}, taf), {
-        messageType: getMessageType(taf, tafAction),
-        baseForecast: formatFormValues(taf.baseForecast)
-      }), taf.changeGroups && {
-        changeGroups: taf.changeGroups.map(formatFormValues)
-      }), addEmptyChangeGroup && {
-        changeGroups: [emptyChangegroup]
-      });
-    };
+    /* *
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2021 - Finnish Meteorological Institute (FMI)
+     * */
 
     var TafFormWrapper = function TafFormWrapper(_a) {
       var tafFromBackend = _a.tafFromBackend,
           mode = _a.mode,
-          tafAction = _a.tafAction,
           _b = _a.TAC,
           TAC = _b === void 0 ? '' : _b,
-          onFormAction = _a.onFormAction;
+          onFormAction = _a.onFormAction,
+          tafAction = _a.tafAction;
       var taf = tafFromBackend.taf;
       var isDisabled = mode === 'view';
-      var defaultValues = prepareTafValues(taf, tafAction, !isDisabled && !taf.changeGroups);
+      var defaultValues = prepareTafValues(taf, undefined, !isDisabled && !taf.changeGroups);
       var options = {
         defaultValues: defaultValues,
         mode: 'onTouched',
@@ -4146,84 +4188,13 @@
         options: options
       }, /*#__PURE__*/React__default["default"].createElement(TafForm, {
         isDisabled: isDisabled,
-        tafAction: tafAction,
         staticTAC: TAC,
         onFormAction: onFormAction,
-        tafFromBackend: tafFromBackend
+        tafFromBackend: tafFromBackend,
+        tafAction: tafAction
       }));
     };
 
-    var useStyles$5 = makeStyles__default["default"]({
-      dialogHeader: {
-        borderRadius: '3px',
-        border: 'solid 1px #f6f5f5',
-        zIndex: 1,
-        padding: '16px 20px'
-      },
-      dialogTitle: {
-        display: 'flex',
-        alignItems: 'center'
-      },
-      dialogCloseButton: {
-        display: 'flex',
-        justifyContent: 'flex-end'
-      },
-      dialogChildren: {
-        display: 'flex',
-        padding: 20,
-        minHeight: 200,
-        minWidth: 400,
-        height: '100%'
-      }
-    });
-
-    var ContentDialog = function ContentDialog(_a) {
-      var open = _a.open;
-          _a.toggleDialogStatus;
-          var titleComponent = _a.titleComponent,
-          children = _a.children;
-          _a.onClose;
-          var _b = _a.alertBanner,
-          alertBanner = _b === void 0 ? null : _b,
-          onFormAction = _a.onFormAction,
-          other = __rest(_a, ["open", "toggleDialogStatus", "titleComponent", "children", "onClose", "alertBanner", "onFormAction"]);
-
-      var classes = useStyles$5();
-      return /*#__PURE__*/React__namespace.createElement(material.Dialog, __assign({
-        "data-testid": "contentDialog",
-        open: open,
-        onClose: function onClose() {
-          return onFormAction('CLOSE');
-        },
-        maxWidth: other.maxWidth ? other.maxWidth : 'lg',
-        PaperProps: {
-          style: {
-            position: 'inherit'
-          }
-        }
-      }, other), /*#__PURE__*/React__namespace.createElement(material.DialogTitle, {
-        className: classes.dialogHeader
-      }, /*#__PURE__*/React__namespace.createElement(material.Grid, {
-        container: true
-      }, /*#__PURE__*/React__namespace.createElement(material.Grid, {
-        item: true,
-        xs: 11,
-        className: classes.dialogTitle
-      }, titleComponent), /*#__PURE__*/React__namespace.createElement(material.Grid, {
-        item: true,
-        xs: true,
-        className: classes.dialogCloseButton
-      }, /*#__PURE__*/React__namespace.createElement(material.IconButton, {
-        "data-testid": "closeDialog",
-        size: "small",
-        onClick: function onClick() {
-          return onFormAction('CLOSE');
-        }
-      }, /*#__PURE__*/React__namespace.createElement(iconsMaterial.Close, null))))), alertBanner !== null && alertBanner, /*#__PURE__*/React__namespace.createElement(material.DialogContent, {
-        className: classes.dialogChildren
-      }, children));
-    };
-
     /* *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.
@@ -4237,175 +4208,23 @@
      * See the License for the specific language governing permissions and
      * limitations under the License.
      *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
-     * */
-
-    var getActiveStatus = function getActiveStatus(listType, className) {
-      return listType === 'ACTIVE' ? /*#__PURE__*/React__default["default"].createElement(iconsMaterial.CheckCircle, {
-        "data-testid": "status-active",
-        className: className,
-        fontSize: "small"
-      }) : /*#__PURE__*/React__default["default"].createElement(iconsMaterial.Schedule, {
-        "data-testid": "status-upcoming",
-        className: className,
-        fontSize: "small"
-      });
-    };
-
-    var getStatusTagList = function getStatusTagList(taf) {
-      // do not return anything if status = 'NEW'
-      if (taf.status === 'NEW') return null;
-
-      if (taf.status === 'CANCELLED') {
-        return /*#__PURE__*/React__default["default"].createElement(shared.StatusTag, {
-          content: "cancelled",
-          color: "red"
-        });
-      }
-
-      return /*#__PURE__*/React__default["default"].createElement(shared.StatusTag, {
-        content: taf.status.toLowerCase(),
-        color: taf.status === 'EXPIRED' ? 'grey' : 'green'
-      });
-    };
-
-    var getDraftTitle = function getDraftTitle(status) {
-      if (status === 'DRAFT_AMENDED') {
-        return 'Draft amendment';
-      }
-
-      if (status === 'DRAFT_CORRECTED') {
-        return 'Draft correction';
-      }
-
-      return 'Draft';
-    };
-    var useStyles$4 = makeStyles__default["default"]({
-      cardWrapper: {
-        width: '100%'
-      },
-      cardContent: {
-        width: '100%'
-      },
-      activeStatus: {
-        color: '#72bb23'
-      },
-      font: {
-        fontWeight: 'normal'
-      },
-      alignIcon: {
-        display: 'flex',
-        alignSelf: 'center'
-      }
-    });
+     * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2022 - Finnish Meteorological Institute (FMI)
+     * */
 
-    var TafListRow = function TafListRow(_a) {
-      var taf = _a.taf,
-          listType = _a.listType,
-          _b = _a.TAC,
-          TAC = _b === void 0 ? '' : _b,
-          _c = _a.showTac,
-          showTac = _c === void 0 ? false : _c;
-      var classes = useStyles$4();
-      var validTimeDate = moment__default["default"].utc(taf.validDateStart).format('DD MMM');
-      var baseTime = moment__default["default"].utc(taf.baseTime).format('HH:mm');
-      return /*#__PURE__*/React__default["default"].createElement(material.Card, {
-        elevation: 0,
-        className: classes.cardWrapper
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        container: true,
-        alignItems: "center",
-        spacing: 1
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 3,
-        sm: 2,
-        md: 1
-      }, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
-        variant: "subtitle2",
-        noWrap: true,
-        className: classes.font
-      }, taf.location)), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 3,
-        sm: 3,
-        md: 1,
-        container: true
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 3,
-        sm: 3,
-        md: 3,
-        className: classes.alignIcon
-      }, showTac && /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
-        "data-testid": "taflistrow-tactooltip",
-        title: /*#__PURE__*/React__default["default"].createElement("div", {
-          style: {
-            whiteSpace: 'pre-line'
-          }
-        }, TAC),
-        placement: "bottom-start"
-      }, /*#__PURE__*/React__default["default"].createElement(iconsMaterial.InfoOutlined, {
-        "data-testid": "taflistrow-tacicon",
-        color: "secondary",
-        fontSize: "small"
-      }))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 9,
-        sm: 9,
-        md: 9
-      }, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
-        variant: "subtitle2",
-        className: classes.font,
-        "data-testid": "baseTime"
-      }, baseTime))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 3,
-        sm: 2,
-        md: 1
-      }, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
-        variant: "subtitle2",
-        className: classes.font,
-        "data-testid": "validTimeDate"
-      }, validTimeDate)), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 3,
-        sm: 3,
-        md: 6
-      }, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
-        variant: "subtitle2",
-        className: classes.font,
-        "data-testid": "validTimeSlot"
-      }, formatValidToString({
-        start: taf.validDateStart,
-        end: taf.validDateEnd
-      }))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 12,
-        sm: 4,
-        md: 3
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        container: true,
-        justifyContent: "flex-start",
-        spacing: 2
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        xs: 8,
-        container: true,
-        justifyContent: "flex-end"
-      }, taf.status === 'DRAFT' || taf.status === 'DRAFT_CORRECTED' || taf.status === 'DRAFT_AMENDED' ? /*#__PURE__*/React__default["default"].createElement(material.Button, {
-        color: "secondary",
-        size: "small",
-        "data-testid": "tafRow-draft",
-        startIcon: /*#__PURE__*/React__default["default"].createElement(iconsMaterial.Create, {
-          fontSize: "small",
-          color: "secondary"
-        })
-      }, getDraftTitle(taf.status)) : getStatusTagList(taf)), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        className: classes.alignIcon
-      }, taf.status !== 'NEW' && taf.status !== 'DRAFT' && taf.status !== 'DRAFT_CORRECTED' && taf.status !== 'DRAFT_AMENDED' && taf.status !== 'CANCELLED' && listType !== 'EXPIRED' && getActiveStatus(listType, classes.activeStatus))))));
+    var TabPanel = function TabPanel(_a) {
+      var children = _a.children,
+          value = _a.value,
+          index = _a.index,
+          other = __rest(_a, ["children", "value", "index"]);
+
+      return /*#__PURE__*/React__default["default"].createElement(material.Box, __assign({
+        role: "tabpanel",
+        hidden: value !== index,
+        id: "simple-tabpanel-" + index,
+        "aria-labelledby": "simple-tab-" + index,
+        "data-testid": "tab-panel-" + index
+      }, other), value === index && children);
     };
 
     /* *
@@ -4421,171 +4240,204 @@
      * See the License for the specific language governing permissions and
      * limitations under the License.
      *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
+     * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2022 - Finnish Meteorological Institute (FMI)
      * */
-    var getListType = function getListType(taf, locationSettings) {
-      if (!taf) return null;
+
+    var TafHeader = function TafHeader(_a) {
+      var title = _a.title;
+      return /*#__PURE__*/React__default["default"].createElement(material.Typography, {
+        sx: {
+          textAlign: 'center',
+          fontWeight: 500,
+          paddingTop: '6px',
+          textTransform: 'capitalize'
+        }
+      }, title);
+    };
+
+    var location_indicator_mwo = "EHDB";
+    var locations = {
+    	EHAM: {
+    		validity_duration: 30,
+    		activity_period: 6,
+    		label: "Schiphol"
+    	},
+    	EHRD: {
+    		validity_duration: 30,
+    		activity_period: 6,
+    		label: "Rotterdam"
+    	},
+    	EHGG: {
+    		validity_duration: 30,
+    		activity_period: 6,
+    		label: "Eelde"
+    	},
+    	EHBK: {
+    		validity_duration: 30,
+    		activity_period: 6,
+    		label: "Maastricht"
+    	},
+    	EHLE: {
+    		validity_duration: 30,
+    		activity_period: 6,
+    		label: "Lelystad"
+    	},
+    	TNCB: {
+    		validity_duration: 30,
+    		activity_period: 6,
+    		label: "Bonaire"
+    	}
+    };
+    var locationOrder = [
+    	"EHAM",
+    	"EHRD",
+    	"EHLE",
+    	"EHGG",
+    	"EHBK",
+    	"TNCB"
+    ];
+    var tafConfig = {
+    	location_indicator_mwo: location_indicator_mwo,
+    	locations: locations,
+    	locationOrder: locationOrder
+    };
+
+    var getTafSettings = function getTafSettings() {
+      return tafConfig;
+    };
+
+    var tafSettings = getTafSettings();
+    var getLocationSetting = function getLocationSetting(location, locationSettings) {
+      if (locationSettings === void 0) {
+        locationSettings = tafSettings.locations;
+      }
+
+      return locationSettings[location];
+    };
+    var sortTafsOnLocation = function sortTafsOnLocation(tafList, locationOrder) {
+      if (locationOrder === void 0) {
+        locationOrder = tafSettings.locationOrder;
+      }
+
+      if (!tafList) return [];
+      return __spreadArray([], __read(tafList)).sort(function (_a, _b) {
+        var tafA = _a.taf;
+        var tafB = _b.taf;
+        return locationOrder.indexOf(tafA.location) < locationOrder.indexOf(tafB.location) ? -1 : 1;
+      });
+    };
+    var getBaseTime = function getBaseTime(baseTime, location) {
+      var currentBaseTime = moment__default["default"].utc(baseTime);
+      var activityPeriod = getLocationSetting(location).activity_period;
+      var nextBaseTime = moment__default["default"].utc(baseTime).add(activityPeriod, 'hours');
+      return {
+        currentBaseTime: currentBaseTime,
+        nextBaseTime: nextBaseTime
+      };
+    };
+    var getTafTimeSlot = function getTafTimeSlot(baseTime, location, status) {
       var now = moment__default["default"].utc();
-      var baseTime = moment__default["default"].utc(taf.baseTime);
-      var activityPeriod = locationSettings[taf.location].activity_period;
-      var nextBaseTime = moment__default["default"].utc(taf.baseTime).add(activityPeriod, 'hours');
 
-      if (taf.status === 'EXPIRED') {
+      var _a = getBaseTime(baseTime, location),
+          currentBaseTime = _a.currentBaseTime,
+          nextBaseTime = _a.nextBaseTime;
+
+      if (status === 'EXPIRED') {
         return 'EXPIRED';
       }
 
-      if (baseTime < now && nextBaseTime > now) {
+      if (currentBaseTime < now && nextBaseTime > now) {
         return 'ACTIVE';
       }
 
       return 'UPCOMING';
     };
+    var sortTafTimeSlots = function sortTafTimeSlots(tafList) {
+      var sortedListOnLocation = sortTafsOnLocation(tafList);
+      return sortedListOnLocation.reduce(function (sortedTafList, tafFromBackend) {
+        var taf = tafFromBackend.taf;
+        var timeSlot = getTafTimeSlot(taf.baseTime, taf.location, taf.status);
+
+        if (timeSlot === 'EXPIRED') {
+          sortedTafList.expired.push(tafFromBackend);
+        } else if (timeSlot === 'ACTIVE') {
+          sortedTafList.current.push(tafFromBackend);
+        } else {
+          sortedTafList.upcoming.push(tafFromBackend);
+        }
 
-    /* *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
-     * */
-
-    var TafFormDialog = function TafFormDialog(_a) {
-      var open = _a.open,
-          toggleFormDialog = _a.toggleFormDialog,
-          tafFromBackend = _a.tafFromBackend,
-          children = _a.children,
-          _b = _a.alertBanner,
-          alertBanner = _b === void 0 ? null : _b,
-          onFormAction = _a.onFormAction;
-      var taf = tafFromBackend ? tafFromBackend.taf : null;
-      var locationSettings = useTafSettings(tafConfig).locations;
-      return /*#__PURE__*/React__default["default"].createElement(ContentDialog, {
-        open: open,
-        toggleDialogStatus: toggleFormDialog,
-        titleComponent: /*#__PURE__*/React__default["default"].createElement(TafListRow, {
-          taf: taf,
-          listType: getListType(taf, locationSettings)
-        }),
-        alertBanner: alertBanner,
-        onFormAction: onFormAction
-      }, children);
+        return sortedTafList;
+      }, {
+        current: [],
+        upcoming: [],
+        expired: []
+      });
+    };
+    var muiTabA11yProps = function muiTabA11yProps(index) {
+      return {
+        id: "simple-tab-" + index,
+        'aria-controls': "simple-tabpanel-" + index
+      };
     };
 
-    var useStyles$3 = makeStyles__default["default"]({
-      accordion: {
-        marginBottom: '5px'
-      },
-      formPadding: {
-        padding: '8px'
-      },
-      expandIcon: {
-        color: '#0075a9'
-      }
-    });
-
-    var fromStatusToAction = function fromStatusToAction(tafStatus) {
-      switch (tafStatus) {
-        case 'DRAFT':
-          return 'DRAFT';
-
-        case 'DRAFT_AMENDED':
-          return 'DRAFT_AMEND';
+    var EditIcon = function EditIcon(props) {
+      var theme = material.useTheme();
+      return /*#__PURE__*/React__namespace.createElement(material.SvgIcon, __assign({}, props), /*#__PURE__*/React__namespace.createElement("g", null, /*#__PURE__*/React__namespace.createElement("path", {
+        d: "m8.332 17.09-.005.001-2.652.604.956-2.542.001-.001.001-.001.857-.744 1.69 1.945-.848.738zm.71.815L20.932 7.577 17.823 4 5.933 14.329l-.01.008.005.005L4.173 19l4.857-1.09-.004-.02.019.02-.002-.005z",
+        fillRule: "evenodd",
+        fill: "" + theme.palette.geowebColors.buttons.tertiary["default"].color
+      })));
+    };
 
-        case 'DRAFT_CORRECTED':
-          return 'DRAFT_CORRECT';
+    var StatusIcon = function StatusIcon(_a) {
+      var timeSlot = _a.timeSlot,
+          status = _a.status;
 
-        default:
-          return 'NEW';
+      if (status === 'NEW') {
+        return null;
       }
-    };
 
-    var TafListAccordion = function TafListAccordion(_a) {
-      var tafListItem = _a.tafListItem,
-          listType = _a.listType,
-          _b = _a.errorCancelTaf,
-          errorCancelTaf = _b === void 0 ? [] : _b,
-          onClickTafActionButton = _a.onClickTafActionButton;
-      var classes = useStyles$3();
-      var status = tafListItem.taf.status;
-      var api$1 = api.useApiContext().api;
+      if (status === 'EXPIRED') {
+        return /*#__PURE__*/React__namespace.createElement(iconsMaterial.Schedule, {
+          "data-testid": "status-expired",
+          fontSize: "small",
+          sx: {
+            transform: 'scaleX(-1)',
+            color: 'geowebColors.buttons.tertiary.disabled.color'
+          }
+        });
+      }
 
-      var _c = __read(useTACGenerator(tafListItem.taf, api$1.getTAC), 2),
-          TAC = _c[0],
-          requestTAC = _c[1];
+      if (status === 'CANCELLED') {
+        return /*#__PURE__*/React__namespace.createElement(DoDisturbIcon__default["default"], {
+          "data-testid": "status-cancelled",
+          fontSize: "small",
+          sx: {
+            color: 'geowebColors.captions.captionError.rgba'
+          }
+        });
+      }
 
-      React__default["default"].useEffect(function () {
-        // only re-retrieve TAC if draft state
-        if (tafListItem.taf.status === 'DRAFT' || tafListItem.taf.status === 'DRAFT_AMENDED' || tafListItem.taf.status === 'DRAFT_CORRECTED') {
-          requestTAC(tafListItem.taf);
-        } // eslint-disable-next-line react-hooks/exhaustive-deps
+      if (status === 'DRAFT' || status === 'DRAFT_CORRECTED' || status === 'DRAFT_AMENDED') {
+        return /*#__PURE__*/React__namespace.createElement(EditIcon, {
+          "data-testid": "status-draft"
+        });
+      }
 
-      }, [tafListItem.taf]);
-      var popOut = status === 'NEW' || status === 'DRAFT' || status === 'DRAFT_AMENDED' || status === 'DRAFT_CORRECTED';
-      return /*#__PURE__*/React__default["default"].createElement(material.Accordion, __assign({
-        "data-testid": "tafListItem",
-        className: classes.accordion
-      }, popOut ? {
-        expanded: false
-      } : {}, {
-        onClick: function onClick() {
-          if (popOut) {
-            onClickTafActionButton(fromStatusToAction(tafListItem.taf.status), tafListItem.taf.uuid);
-          }
-        },
-        TransitionProps: {
-          unmountOnExit: true
+      return timeSlot === 'ACTIVE' ? /*#__PURE__*/React__namespace.createElement(iconsMaterial.CheckCircle, {
+        "data-testid": "status-active",
+        fontSize: "small",
+        sx: {
+          color: 'geowebColors.functional.success'
         }
-      }), /*#__PURE__*/React__default["default"].createElement(material.AccordionSummary, {
-        "data-testid": "tafListSectionAccordionSummary",
-        expandIcon: popOut ? /*#__PURE__*/React__default["default"].createElement(material.Tooltip, {
-          title: "Popout to edit",
-          className: classes.expandIcon
-        }, /*#__PURE__*/React__default["default"].createElement(iconsMaterial.OpenInNew, {
-          "data-testid": "popOutIcon",
-          fontSize: "small"
-        })) : /*#__PURE__*/React__default["default"].createElement(iconsMaterial.ExpandMore, {
-          className: classes.expandIcon,
-          "data-testid": "expandIcon"
-        })
-      }, /*#__PURE__*/React__default["default"].createElement(TafListRow, {
-        taf: tafListItem.taf,
-        listType: listType,
-        TAC: TAC,
-        showTac: true
-      })), /*#__PURE__*/React__default["default"].createElement(material.AccordionDetails, null, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        container: true,
-        direction: "column"
-      }, errorCancelTaf.length > 0 && errorCancelTaf.find(function (uuid) {
-        return uuid === tafListItem.taf.uuid;
-      }) && /*#__PURE__*/React__default["default"].createElement(shared.AlertBanner, {
-        severity: "error",
-        title: "Cancelling this TAF failed, please try again",
-        dataTestId: "tafList-cancelAlert"
-      }), /*#__PURE__*/React__default["default"].createElement("div", {
-        className: classes.formPadding
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true
-      }, /*#__PURE__*/React__default["default"].createElement(TafFormWrapper, {
-        tafFromBackend: tafListItem,
-        mode: "view",
-        TAC: TAC
-      })), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true
-      }, /*#__PURE__*/React__default["default"].createElement(TafListButtons, {
-        canBe: tafListItem.canbe,
-        uuid: tafListItem.taf.uuid,
-        onClickTafActionButton: onClickTafActionButton
-      }))))));
+      }) : /*#__PURE__*/React__namespace.createElement(iconsMaterial.Schedule, {
+        "data-testid": "status-upcoming",
+        fontSize: "small",
+        sx: {
+          color: 'geowebColors.functional.success'
+        }
+      });
     };
 
     /* *
@@ -4601,138 +4453,319 @@
      * See the License for the specific language governing permissions and
      * limitations under the License.
      *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
+     * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2022 - Finnish Meteorological Institute (FMI)
      * */
-    var useStyles$2 = makeStyles__default["default"]({
-      listHeaders: {
-        color: '#9d9d9d'
-      },
-      formPadding: {
-        padding: '8px'
-      },
-      paperButton: {
-        width: '100%'
-      }
-    });
 
-    var TafListSection = function TafListSection(_a) {
-      var tafList = _a.tafList,
-          title = _a.title,
-          listType = _a.listType,
-          _b = _a.errorCancelTaf,
-          errorCancelTaf = _b === void 0 ? [] : _b,
-          onClickTafActionButton = _a.onClickTafActionButton;
-      var classes = useStyles$2();
-      return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
-        variant: "subtitle2",
-        className: classes.listHeaders
-      }, title), /*#__PURE__*/React__default["default"].createElement("div", {
-        "data-testid": "tafList" + listType
-      }, tafList.map(function (tafListItem) {
-        return /*#__PURE__*/React__default["default"].createElement(TafListAccordion, {
-          key: tafListItem.taf.uuid + "-" + tafListItem.taf.status,
-          tafListItem: tafListItem,
-          listType: listType,
-          errorCancelTaf: errorCancelTaf,
-          onClickTafActionButton: onClickTafActionButton
-        });
+    var TacContainer = function TacContainer(_a) {
+      var taf = _a.taf,
+          _b = _a.isActive,
+          isActive = _b === void 0 ? false : _b;
+      var api$1 = api.useApiContext().api;
+
+      var _c = __read(useTACGenerator(taf, api$1.getTAC), 2),
+          TAC = _c[0],
+          retrieveTAC = _c[1];
+
+      var status = taf.status,
+          location = taf.location,
+          baseTime = taf.baseTime;
+      var locationLabel = getLocationSetting(location).label;
+      var timeSlot = getTafTimeSlot(baseTime, location, status);
+      React__default["default"].useEffect(function () {
+        if (isActive) {
+          retrieveTAC(taf);
+        }
+      }, [taf, isActive, retrieveTAC]);
+      return /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        sx: {
+          marginBottom: '20px'
+        },
+        "data-location": location,
+        className: isActive ? 'active' : null
+      }, /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        sx: {
+          display: 'flex',
+          alignItems: 'center',
+          marginBottom: '2px'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        sx: {
+          width: 20,
+          height: 20,
+          display: 'flex',
+          marginRight: '6px'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(StatusIcon, {
+        timeSlot: timeSlot,
+        status: status
+      })), /*#__PURE__*/React__default["default"].createElement(material.Typography, {
+        sx: __assign({
+          lineHeight: 1
+        }, isActive && {
+          backgroundColor: 'geowebColors.functional.warningHighlight.rgba',
+          padding: '0 2px',
+          marginLeft: '-2px'
+        })
+      }, /*#__PURE__*/React__default["default"].createElement(material.Typography, {
+        sx: {
+          fontSize: '12px',
+          color: 'geowebColors.captions.captionInformation.rgba'
+        },
+        "data-testid": "tafLocation",
+        component: "span"
+      }, location), /*#__PURE__*/React__default["default"].createElement(material.Typography, {
+        sx: {
+          fontSize: '12px',
+          marginLeft: '10px'
+        },
+        "data-testid": "tafLocationLabel",
+        component: "span"
+      }, locationLabel))), /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        sx: {
+          fontSize: '12px',
+          letterSpacing: '0.4px',
+          color: 'geowebColors.captions.captionStatus.rgba'
+        }
+      }, TAC.split('\n').map(function (line) {
+        return /*#__PURE__*/React__default["default"].createElement(material.Box, {
+          component: "span",
+          key: line,
+          sx: {
+            display: 'inline-block'
+          }
+        }, /*#__PURE__*/React__default["default"].createElement(material.Box, {
+          component: "span",
+          sx: __assign({
+            display: 'inline',
+            boxDecorationBreak: 'clone',
+            WebkitBoxDecorationBreak: 'clone'
+          }, isActive && {
+            backgroundColor: 'geowebColors.functional.warningHighlight.rgba'
+          })
+        }, line));
+      })));
+    };
+
+    var TacOverview = function TacOverview(_a) {
+      var _b = _a.upcomingTafs,
+          upcomingTafs = _b === void 0 ? [] : _b,
+          _c = _a.currentTafs,
+          currentTafs = _c === void 0 ? [] : _c,
+          _d = _a.expiredTafs,
+          expiredTafs = _d === void 0 ? [] : _d,
+          _e = _a.hideTitle,
+          hideTitle = _e === void 0 ? false : _e,
+          _f = _a.activeTaf,
+          activeTaf = _f === void 0 ? null : _f;
+
+      var _g = __read(React__default["default"].useState(0), 2),
+          activeTab = _g[0],
+          setActiveTab = _g[1];
+
+      var scrollRef = React__default["default"].useRef(null);
+      var tabs = [{
+        title: 'Upcoming',
+        tafList: upcomingTafs
+      }, {
+        title: 'Current & Expired',
+        tafList: sortTafsOnLocation(__spreadArray(__spreadArray([], __read(currentTafs)), __read(expiredTafs)))
+      }];
+      var activeLocation = (activeTaf === null || activeTaf === void 0 ? void 0 : activeTaf.taf.location) || null;
+
+      var isActiveLocation = function isActiveLocation(location) {
+        return location === activeLocation;
+      };
+
+      var scrollToPosition = React__default["default"].useCallback(function () {
+        if (!scrollRef.current) return;
+        var containerTop = scrollRef.current.getBoundingClientRect().top;
+        var firstLocation = scrollRef.current.querySelector("[data-location=\"" + activeLocation + "\"]");
+        var paddingTop = parseInt(getComputedStyle(scrollRef.current).paddingTop, 10);
+        var newScrollPosition = (firstLocation === null || firstLocation === void 0 ? void 0 : firstLocation.getBoundingClientRect().top) - containerTop + scrollRef.current.scrollTop - paddingTop;
+        scrollRef.current.scrollTo(newScrollPosition, newScrollPosition);
+      }, [activeLocation]);
+
+      var resetScrollPosition = function resetScrollPosition() {
+        return scrollRef.current.scrollTo(0, 0);
+      };
+
+      var onChangeTab = function onChangeTab(_event, newValue) {
+        setActiveTab(newValue);
+        resetScrollPosition();
+      };
+
+      React__default["default"].useEffect(function () {
+        if (activeLocation) {
+          scrollToPosition();
+        }
+      }, [activeLocation, scrollToPosition]);
+      React__default["default"].useEffect(function () {
+        var SCROLL_DELAY = 1000;
+        var timer = setTimeout(function () {
+          scrollToPosition();
+        }, SCROLL_DELAY);
+        return function () {
+          clearTimeout(timer);
+        };
+      }, [activeTab, scrollToPosition]);
+      return /*#__PURE__*/React__default["default"].createElement(material.Card, {
+        variant: "outlined",
+        sx: {
+          maxHeight: '100%',
+          overflow: 'hidden',
+          display: 'flex',
+          flexDirection: 'column'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        sx: {
+          zIndex: 1
+        }
+      }, !hideTitle && /*#__PURE__*/React__default["default"].createElement(TafHeader, {
+        title: "TAC Overview"
+      }), /*#__PURE__*/React__default["default"].createElement(material.Tabs, {
+        value: activeTab,
+        onChange: onChangeTab,
+        "aria-label": "tabs"
+      }, tabs.map(function (tab, index) {
+        return /*#__PURE__*/React__default["default"].createElement(material.Tab, __assign({
+          key: tab.title,
+          sx: {
+            flexGrow: 1
+          },
+          label: tab.title,
+          "data-testid": "tab-" + index
+        }, muiTabA11yProps(index)));
+      }))), /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        ref: scrollRef,
+        sx: {
+          padding: '10px',
+          maxHeight: '100%',
+          overflow: 'auto'
+        }
+      }, tabs.map(function (tab, index) {
+        return /*#__PURE__*/React__default["default"].createElement(TabPanel, {
+          key: tab.title,
+          value: activeTab,
+          index: index
+        }, tab.tafList.map(function (_a) {
+          var taf = _a.taf;
+          return /*#__PURE__*/React__default["default"].createElement(TacContainer, {
+            key: taf.uuid,
+            taf: taf,
+            isActive: isActiveLocation(taf.location)
+          });
+        }));
       })));
     };
 
-    var useStyles$1 = makeStyles__default["default"]({
-      accordion: {
-        marginBottom: '5px'
-      },
-      listHeaders: {
-        color: '#9d9d9d'
-      },
-      listBody: {
-        width: '100%',
-        minHeight: '600px'
-      }
-    });
+    var TacOverviewIcon = /*#__PURE__*/React__namespace.createElement(material.SvgIcon, null, /*#__PURE__*/React__namespace.createElement("path", {
+      d: "M3 3h4v4H3V3zm0 7h4v4H3v-4zm0 7h4v4H3v-4zm7-14h11v4H10V3zm0 7h11v4H10v-4zm0 7h11v4H10v-4z"
+    }));
 
-    var TafList = function TafList(_a) {
-      var e_1, _b;
+    var TacOverviewMobile = function TacOverviewMobile(_a) {
+      var upcomingTafs = _a.upcomingTafs,
+          currentTafs = _a.currentTafs,
+          expiredTafs = _a.expiredTafs,
+          activeTaf = _a.activeTaf,
+          _b = _a.defaultOpen,
+          defaultOpen = _b === void 0 ? false : _b;
 
-      var tafList = _a.tafList,
-          isLoading = _a.isLoading,
-          error = _a.error,
-          _c = _a.errorCancelTaf,
-          errorCancelTaf = _c === void 0 ? [] : _c,
-          onClickTafActionButton = _a.onClickTafActionButton;
-      var classes = useStyles$1();
-      var locationSettings = useTafSettings(tafConfig).locations;
-      var upcomingTafs = [];
-      var currentTafs = [];
-      var expiredTafs = [];
-
-      if (tafList) {
-        try {
-          for (var tafList_1 = __values(tafList), tafList_1_1 = tafList_1.next(); !tafList_1_1.done; tafList_1_1 = tafList_1.next()) {
-            var taf = tafList_1_1.value;
-            var now = moment__default["default"].utc();
-            var baseTime = moment__default["default"].utc(taf.taf.baseTime);
-            var activityPeriod = locationSettings[taf.taf.location].activity_period;
-            var nextBaseTime = moment__default["default"].utc(taf.taf.baseTime).add(activityPeriod, 'hours');
-
-            if (taf.taf.status === 'EXPIRED') {
-              expiredTafs.push(taf);
-            } else if (baseTime < now && nextBaseTime > now) {
-              currentTafs.push(taf);
-            } else {
-              upcomingTafs.push(taf);
-            }
-          }
-        } catch (e_1_1) {
-          e_1 = {
-            error: e_1_1
-          };
-        } finally {
-          try {
-            if (tafList_1_1 && !tafList_1_1.done && (_b = tafList_1["return"])) _b.call(tafList_1);
-          } finally {
-            if (e_1) throw e_1.error;
-          }
+      var _c = __read(React__namespace.useState(defaultOpen), 2),
+          isOpen = _c[0],
+          toggleOpen = _c[1];
+
+      var onClose = function onClose() {
+        return toggleOpen(false);
+      };
+
+      return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(shared.ToolButton, {
+        active: isOpen,
+        onClick: function onClick() {
+          return toggleOpen(true);
+        },
+        "data-testid": "tac-overview-mobile-button",
+        sx: {
+          display: {
+            xs: 'inline-flex',
+            sm: 'none'
+          },
+          position: 'absolute',
+          right: '8px',
+          top: '30px'
         }
+      }, TacOverviewIcon), /*#__PURE__*/React__namespace.createElement(material.Dialog, {
+        open: isOpen,
+        onClose: onClose,
+        PaperProps: {
+          sx: {
+            margin: 2,
+            width: '100%',
+            height: '100%'
+          }
+        },
+        "data-testid": "tac-overview-mobile"
+      }, /*#__PURE__*/React__namespace.createElement(shared.ToolHeader, {
+        title: "TAC Overview",
+        size: "small",
+        isDraggable: false,
+        onClose: onClose
+      }), /*#__PURE__*/React__namespace.createElement(TacOverview, {
+        upcomingTafs: upcomingTafs,
+        currentTafs: currentTafs,
+        expiredTafs: expiredTafs,
+        activeTaf: activeTaf,
+        hideTitle: true
+      })));
+    };
+
+    var formatBaseTime = function formatBaseTime(time) {
+      return time.format('HH:mm DD MMM');
+    };
+
+    var TopTabs = function TopTabs(_a) {
+      var timeSlot = _a.timeSlot,
+          _b = _a.onChangeTimeSlot,
+          onChangeTimeSlot = _b === void 0 ? function () {} : _b,
+          tafFromBackend = _a.tafFromBackend;
+
+      if (!tafFromBackend) {
+        return null;
       }
 
-      return /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        container: true,
-        direction: "column",
-        alignItems: "stretch"
-      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
-        item: true,
-        className: classes.listBody
-      }, error && /*#__PURE__*/React__default["default"].createElement(shared.AlertBanner, {
-        severity: "error",
-        title: "An error has occurred while retrieving the list, please try again",
-        info: error.message ? error.message : '',
-        dataTestId: "tafList-alert"
-      }), tafList && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(TafListSection, {
-        title: "Upcoming",
-        listType: "UPCOMING",
-        tafList: upcomingTafs,
-        errorCancelTaf: errorCancelTaf,
-        onClickTafActionButton: onClickTafActionButton
-      }), /*#__PURE__*/React__default["default"].createElement(TafListSection, {
-        title: "Current time slot",
-        listType: "ACTIVE",
-        tafList: currentTafs,
-        errorCancelTaf: errorCancelTaf,
-        onClickTafActionButton: onClickTafActionButton
-      }), /*#__PURE__*/React__default["default"].createElement(TafListSection, {
-        title: "Expired",
-        listType: "EXPIRED",
-        tafList: expiredTafs,
-        errorCancelTaf: errorCancelTaf,
-        onClickTafActionButton: onClickTafActionButton
-      })), isLoading && /*#__PURE__*/React__default["default"].createElement(material.Skeleton, {
-        "data-testid": "tafList-skeleton",
-        variant: "rectangular",
-        height: "660px"
-      })));
+      var activeTab = timeSlot === 'UPCOMING' ? 0 : 1;
+
+      var _c = getBaseTime(tafFromBackend.taf.baseTime, tafFromBackend.taf.location),
+          currentBaseTime = _c.currentBaseTime,
+          nextBaseTime = _c.nextBaseTime;
+
+      var tabs = [{
+        title: "Upcoming " + formatBaseTime(nextBaseTime),
+        timeSlot: 'UPCOMING'
+      }, {
+        title: "Current " + formatBaseTime(currentBaseTime),
+        timeSlot: 'ACTIVE'
+      }];
+
+      var onChangeTab = function onChangeTab(_event, newValue) {
+        onChangeTimeSlot(tabs[newValue].timeSlot);
+      };
+
+      return /*#__PURE__*/React__default["default"].createElement(material.Tabs, {
+        value: activeTab,
+        onChange: onChangeTab,
+        "aria-label": "timeslot-tabs",
+        variant: "fullWidth"
+      }, tabs.map(function (tab, index) {
+        return /*#__PURE__*/React__default["default"].createElement(material.Tab, __assign({
+          key: tab.title,
+          label: tab.title,
+          "data-testid": "tab-" + index,
+          sx: {
+            fontSize: 16
+          }
+        }, muiTabA11yProps(index)));
+      }));
     };
 
     /* *
@@ -4748,189 +4781,270 @@
      * See the License for the specific language governing permissions and
      * limitations under the License.
      *
-     * Copyright 2021 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
-     * Copyright 2021 - Finnish Meteorological Institute (FMI)
+     * Copyright 2022 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+     * Copyright 2022 - Finnish Meteorological Institute (FMI)
      * */
-    var useStyles = makeStyles__default["default"]({
-      backdrop: {
-        zIndex: 1500,
-        color: '#fff'
-      }
-    });
-
-    var Spinner = function Spinner() {
-      var classes = useStyles();
-      return /*#__PURE__*/React__default["default"].createElement(material.Backdrop, {
-        open: true,
-        className: classes.backdrop
-      }, /*#__PURE__*/React__default["default"].createElement(material.CircularProgress, {
-        "data-testid": "spinner",
-        color: "inherit"
-      }));
-    };
-
-    var useTimeoutCancelError = function useTimeoutCancelError(pollingInterval) {
-      if (pollingInterval === void 0) {
-        pollingInterval = 10000;
-      }
-
-      var _a = __read(React__default["default"].useState([]), 2),
-          errorCancelTaf = _a[0],
-          setErrorCancelTaf = _a[1];
 
-      React__default["default"].useEffect(function () {
-        var cancelErrorMessageHandler = errorCancelTaf.length > 0 ? setTimeout(function () {
-          if (errorCancelTaf.length > 0) {
-            setErrorCancelTaf(errorCancelTaf.slice(1));
+    var LocationTabs = function LocationTabs(_a) {
+      var tafList = _a.tafList,
+          _b = _a.activeIndex,
+          activeIndex = _b === void 0 ? 0 : _b,
+          _c = _a.onChangeTab,
+          onChangeTab = _c === void 0 ? function () {} : _c,
+          timeSlot = _a.timeSlot;
+      return /*#__PURE__*/React__namespace.createElement(material.MenuList, {
+        "data-testid": "location-tabs",
+        sx: {
+          paddingTop: '32px'
+        }
+      }, tafList.map(function (_a, index) {
+        var taf = _a.taf;
+        return /*#__PURE__*/React__namespace.createElement(material.MenuItem, {
+          key: taf.uuid,
+          selected: index === activeIndex,
+          sx: {
+            backgroundColor: 'geowebColors.cards.cardContainer',
+            borderColor: 'geowebColors.cards.cardContainerBorder',
+            borderWidth: '1px',
+            borderStyle: 'solid',
+            margin: '0 0 4px',
+            height: '56px',
+            justifyContent: 'center',
+            ':after': {
+              background: 'none!important'
+            },
+            '&.Mui-selected': {
+              backgroundColor: 'geowebColors.cards.cardContainer',
+              marginRight: '-17px',
+              borderRight: '0px',
+              zIndex: 1
+            }
+          },
+          onClick: function onClick() {
+            return onChangeTab(index);
           }
-        }, pollingInterval) : null;
-        return function () {
-          if (cancelErrorMessageHandler !== null) {
-            clearTimeout(cancelErrorMessageHandler);
+        }, /*#__PURE__*/React__namespace.createElement(Box__default["default"], {
+          component: "span",
+          sx: {
+            fontSize: '12px',
+            fontWeight: '500',
+            letterSpacing: '0.09px',
+            '& + svg': {
+              position: 'absolute',
+              bottom: '1px',
+              width: '20px',
+              height: '20px'
+            }
           }
-        }; // eslint-disable-next-line react-hooks/exhaustive-deps
-      }, [errorCancelTaf]);
-      return [errorCancelTaf, setErrorCancelTaf];
-    };
-    var getSelectedTaf = function getSelectedTaf(selectedTafId, tafList) {
-      if (tafList === null) return undefined;
-      return tafList.find(function (element) {
-        return element.taf.uuid === selectedTafId;
-      });
+        }, taf.location), /*#__PURE__*/React__namespace.createElement(StatusIcon, {
+          timeSlot: timeSlot,
+          status: taf.status
+        }));
+      }));
     };
 
-    var TafWrapper = function TafWrapper() {
-      var api$1 = api.useApiContext().api;
-      var confirmDialog = shared.useConfirmationDialog();
-
-      var _a = __read(React__default["default"].useState(false), 2),
-          isTafDialogOpen = _a[0],
-          setTafDialogOpen = _a[1];
-
-      var _b = __read(React__default["default"].useState(null), 2),
-          selectedTafId = _b[0],
-          setselectedTafId = _b[1];
+    var Spinner = function Spinner(props) {
+      return /*#__PURE__*/React__default["default"].createElement(material.Backdrop, __assign({
+        open: true
+      }, props), /*#__PURE__*/React__default["default"].createElement(material.CircularProgress, {
+        "data-testid": "spinner",
+        color: "inherit"
+      }));
+    };
 
-      var _c = __read(React__default["default"].useState(null), 2),
-          tafDialogAction = _c[0],
-          setTafDialogAction = _c[1];
+    var fromActionToStatus = function fromActionToStatus(tafAction) {
+      switch (tafAction) {
+        case 'DRAFT':
+          return 'DRAFT';
 
-      var _d = __read(React__default["default"].useState(false), 2),
-          errorPostMessage = _d[0],
-          setErrorPostMessage = _d[1];
+        case 'DRAFT_AMEND':
+          return 'DRAFT_AMENDED';
 
-      var _e = __read(React__default["default"].useState(''), 2),
-          errorPostMessageText = _e[0],
-          setErrorPostMessageText = _e[1];
+        case 'DRAFT_CORRECT':
+          return 'DRAFT_CORRECTED';
 
-      var _f = __read(React__default["default"].useState(false), 2),
-          showSpinner = _f[0],
-          setSpinner = _f[1]; // clear error message for cancel after 10 seconds
+        case 'PUBLISH':
+          return 'PUBLISHED';
 
+        case 'AMEND':
+          return 'AMENDED';
 
-      var _g = __read(useTimeoutCancelError(), 2),
-          errorCancelTaf = _g[0],
-          setErrorCancelTaf = _g[1]; // Retrieve list of tafs
+        case 'CORRECT':
+          return 'CORRECTED';
 
+        case 'CANCEL':
+          return 'CANCELLED';
 
-      var _h = api.useApi(api$1.getTafList),
-          errorList = _h.error,
-          isLoadingList = _h.isLoading,
-          tafList = _h.result,
-          fetchNewTafList = _h.fetchApiData;
+        default:
+          return 'NEW';
+      }
+    };
 
-      var getNewTafList = function getNewTafList() {
-        fetchNewTafList({});
-      };
+    var TafPanel = function TafPanel(_a) {
+      var tafFromBackend = _a.tafFromBackend,
+          activeTafIndex = _a.activeTafIndex,
+          index = _a.index,
+          _b = _a.onPostTaf,
+          onPostTaf = _b === void 0 ? function () {} : _b;
+      var api$1 = api.useApiContext().api;
 
-      shared.usePoller([tafList, errorList], getNewTafList);
+      var _c = __read(React__default["default"].useState(false), 2),
+          isLoading = _c[0],
+          setLoading = _c[1];
 
-      var toggleTafDialog = function toggleTafDialog() {
-        // Refresh list on closing dialog
-        if (isTafDialogOpen === true) getNewTafList(); // Set error message back to false
+      var _d = __read(React__default["default"].useState(null), 2),
+          error = _d[0],
+          setError = _d[1]; // removes cancelled error message
 
-        setErrorPostMessage(false);
-        setErrorPostMessageText('');
-        setTafDialogOpen(!isTafDialogOpen);
-      };
 
       React__default["default"].useEffect(function () {
-        if (selectedTafId) {
-          toggleTafDialog();
-        } // eslint-disable-next-line react-hooks/exhaustive-deps
-
-      }, [selectedTafId]);
-
-      var onClickTafActionButton = function onClickTafActionButton(action, tafUuid) {
-        if (action === 'CANCEL') {
-          confirmDialog({
-            title: 'Cancel TAF',
-            description: 'Are you sure you want to cancel this TAF?',
-            confirmLabel: 'Cancel'
-          }).then(function () {
-            var taf = getSelectedTaf(tafUuid, tafList).taf;
-            postTaf({
-              taf: taf,
-              changeStatusTo: 'CANCELLED'
-            });
-          });
-        } else if (selectedTafId === tafUuid) {
-          setTafDialogAction(action);
-          toggleTafDialog();
-        } else {
-          setTafDialogAction(action);
-          setselectedTafId(tafUuid);
-        }
-      };
+        var cancelErrorTimeout = error && error.type === 'CANCELLED' ? setTimeout(function () {
+          setError(null);
+        }, 10000) : null;
+        return function () {
+          if (cancelErrorTimeout !== null) {
+            clearTimeout(cancelErrorTimeout);
+          }
+        };
+      }, [error]);
 
       var postTaf = function postTaf(data) {
         return __awaiter(void 0, void 0, void 0, function () {
-          var error_1;
+          var error_1, newError;
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                setSpinner(true);
-                _a.label = 1;
-
-              case 1:
-                _a.trys.push([1, 3,, 4]);
+                _a.trys.push([0, 2,, 3]);
 
+                setLoading(true);
                 return [4
                 /*yield*/
                 , api$1.postTaf(data)];
 
-              case 2:
+              case 1:
                 _a.sent();
 
-                if (isTafDialogOpen) toggleTafDialog();
-                setSpinner(false); // fetch new taflist
+                setLoading(false);
+                setError(null); // callback
 
-                getNewTafList(); // If a post has succeeded remove error message
-
-                setErrorCancelTaf([]);
+                onPostTaf();
                 return [3
                 /*break*/
-                , 4];
+                , 3];
 
-              case 3:
+              case 2:
                 error_1 = _a.sent();
+                newError = data.changeStatusTo === 'CANCELLED' ? {
+                  type: 'CANCELLED',
+                  title: 'Cancelling this TAF failed, please try again'
+                } : {
+                  type: 'SERVER',
+                  title: 'An error has occurred while saving, please try again',
+                  message: shared.getAxiosErrorMessage(error_1)
+                };
+                setError(newError);
+                setLoading(false);
+                throw error_1;
+
+              case 3:
+                return [2
+                /*return*/
+                ];
+            }
+          });
+        });
+      };
 
-                if (data.changeStatusTo === 'CANCELLED') {
-                  setErrorCancelTaf(__spreadArray(__spreadArray([], __read(errorCancelTaf)), [data.taf.uuid]));
-                } else {
-                  setErrorPostMessage(true);
+      var getViewMode = function getViewMode(status) {
+        return status === 'NEW' || status === 'DRAFT' || status === 'DRAFT_AMENDED' || status === 'DRAFT_CORRECTED' ? 'edit' : 'view';
+      };
 
-                  if (shared.isAxiosError(error_1)) {
-                    setErrorPostMessageText(shared.getAxiosErrorMessage(error_1));
-                  }
+      var onTafAction = function onTafAction(action, taf) {
+        return __awaiter(void 0, void 0, void 0, function () {
+          var _a;
+
+          return __generator(this, function (_b) {
+            switch (_b.label) {
+              case 0:
+                _b.trys.push([0, 5,, 6]);
+
+                _a = action;
+
+                switch (_a) {
+                  case 'DRAFT':
+                    return [3
+                    /*break*/
+                    , 1];
+
+                  case 'DRAFT_AMEND':
+                    return [3
+                    /*break*/
+                    , 1];
+
+                  case 'DRAFT_CORRECT':
+                    return [3
+                    /*break*/
+                    , 1];
+
+                  case 'PUBLISH':
+                    return [3
+                    /*break*/
+                    , 1];
+
+                  case 'AMEND':
+                    return [3
+                    /*break*/
+                    , 1];
+
+                  case 'CANCEL':
+                    return [3
+                    /*break*/
+                    , 1];
+
+                  case 'CORRECT':
+                    return [3
+                    /*break*/
+                    , 1];
                 }
 
-                setSpinner(false);
                 return [3
                 /*break*/
-                , 4];
+                , 3];
+
+              case 1:
+                // post taf
+                return [4
+                /*yield*/
+                , postTaf({
+                  taf: taf,
+                  changeStatusTo: fromActionToStatus(action)
+                })];
+
+              case 2:
+                // post taf
+                _b.sent();
+
+                return [2
+                /*return*/
+                , true];
+
+              case 3:
+                return [2
+                /*return*/
+                , false];
 
               case 4:
+                return [3
+                /*break*/
+                , 6];
+
+              case 5:
+                _b.sent();
+                return [2
+                /*return*/
+                , false];
+
+              case 6:
                 return [2
                 /*return*/
                 ];
@@ -4939,97 +5053,273 @@
         });
       };
 
-      var fromActionToStatus = function fromActionToStatus(tafAction) {
-        switch (tafAction) {
-          case 'DRAFT':
-            return 'DRAFT';
-
-          case 'DRAFT_AMEND':
-            return 'DRAFT_AMENDED';
+      return /*#__PURE__*/React__default["default"].createElement(TabPanel, {
+        value: activeTafIndex,
+        index: index,
+        "data-testid": "taf-panel" + (activeTafIndex === index ? '-active' : '')
+      }, /*#__PURE__*/React__default["default"].createElement(TafHeader, {
+        title: getTafStatusLabel(tafFromBackend.taf.status)
+      }), isLoading && /*#__PURE__*/React__default["default"].createElement(Spinner, {
+        "data-testid": "taf-loading",
+        sx: {
+          position: 'absolute',
+          zIndex: 1,
+          color: 'geowebColors.backdrops.white.fill'
+        }
+      }), error && /*#__PURE__*/React__default["default"].createElement(shared.AlertBanner, {
+        severity: "error",
+        title: error.title,
+        info: error.message,
+        dataTestId: "taf-error"
+      }), /*#__PURE__*/React__default["default"].createElement(TafFormWrapper, {
+        mode: getViewMode(tafFromBackend.taf.status),
+        tafFromBackend: tafFromBackend,
+        onFormAction: onTafAction
+      }));
+    };
 
-          case 'DRAFT_CORRECT':
-            return 'DRAFT_CORRECTED';
+    var TafLayout = function TafLayout(_a) {
+      var _b = _a.tafList,
+          tafList = _b === void 0 ? [] : _b,
+          _c = _a.onPostTaf,
+          onPostTaf = _c === void 0 ? function () {} : _c;
+
+      var _d = __read(React__default["default"].useState(sortTafTimeSlots(tafList)), 2),
+          _e = _d[0],
+          upcoming = _e.upcoming,
+          current = _e.current,
+          expired = _e.expired,
+          updateSortedTafs = _d[1];
+
+      var _f = __read(upcoming.slice(-1), 1),
+          lastUpcomingTaf = _f[0];
+
+      var _g = __read(React__default["default"].useState('UPCOMING'), 2),
+          timeSlot = _g[0],
+          setTimeSlot = _g[1];
+
+      var _h = __read(React__default["default"].useState(upcoming), 2),
+          locations = _h[0],
+          setLocations = _h[1];
+
+      var _j = __read(React__default["default"].useState(0), 2),
+          activeTafIndex = _j[0],
+          setActiveTafIndex = _j[1];
+
+      var onChangeTimeSlot = function onChangeTimeSlot(newTimeSlot) {
+        setTimeSlot(newTimeSlot);
+        setLocations(newTimeSlot === 'ACTIVE' ? current : upcoming);
+        setActiveTafIndex(0);
+      };
 
-          case 'PUBLISH':
-            return 'PUBLISHED';
+      React__default["default"].useEffect(function () {
+        var newSortedTafs = sortTafTimeSlots(tafList);
+        var updatedLocations = timeSlot === 'ACTIVE' ? newSortedTafs.current : newSortedTafs.upcoming;
+        updateSortedTafs(sortTafTimeSlots(tafList));
+        setLocations(updatedLocations); // update active index
 
-          case 'AMEND':
-            return 'AMENDED';
+        var newActiveIndex = updatedLocations.findIndex(function (location) {
+          return location.taf.previousId === locations[activeTafIndex].taf.uuid;
+        });
+        var newIndex = newActiveIndex !== -1 ? newActiveIndex : activeTafIndex;
+        setActiveTafIndex(newIndex); // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, [tafList, setLocations]);
 
-          case 'CORRECT':
-            return 'CORRECTED';
+      if (!tafList) {
+        return null;
+      }
 
-          default:
-            return 'NEW';
+      var activeTaf = locations[activeTafIndex];
+      return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        id: MODAL_DIALOG_ELEMENT,
+        component: "div",
+        sx: {
+          width: '100%',
+          height: '100%',
+          position: 'absolute',
+          overflow: 'hidden',
+          pointerEvents: 'none'
         }
-      };
+      }), /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        sx: {
+          height: '100%',
+          maxHeight: '100%'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(material.Box, {
+        sx: {
+          minWidth: 320,
+          maxWidth: 1272,
+          margin: 'auto',
+          height: '100%',
+          display: 'flex',
+          flexDirection: 'column'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        container: true,
+        spacing: 2,
+        sx: {
+          paddingLeft: 1,
+          paddingRight: 1
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        item: true,
+        xs: 12,
+        sm: 9
+      }, /*#__PURE__*/React__default["default"].createElement(TopTabs, {
+        tafFromBackend: lastUpcomingTaf,
+        timeSlot: timeSlot,
+        onChangeTimeSlot: onChangeTimeSlot
+      }))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        container: true,
+        flexGrow: 1,
+        overflow: "hidden"
+      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        container: true,
+        spacing: 2,
+        sx: {
+          height: '100%',
+          paddingLeft: 1,
+          paddingRight: 1,
+          paddingTop: 2,
+          overflow: 'auto'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        item: true,
+        xs: 3,
+        sm: 1
+      }, /*#__PURE__*/React__default["default"].createElement(LocationTabs, {
+        tafList: locations,
+        activeIndex: activeTafIndex,
+        onChangeTab: setActiveTafIndex,
+        timeSlot: timeSlot
+      })), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        item: true,
+        xs: true
+      }, /*#__PURE__*/React__default["default"].createElement(material.Card, {
+        variant: "outlined",
+        sx: {
+          padding: 1,
+          paddingTop: 0,
+          marginBottom: '12px',
+          position: 'relative'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(TacOverviewMobile, {
+        upcomingTafs: upcoming,
+        currentTafs: current,
+        expiredTafs: expired,
+        activeTaf: activeTaf
+      }), locations.map(function (tafFromBackend, index) {
+        return /*#__PURE__*/React__default["default"].createElement(TafPanel, {
+          key: tafFromBackend.taf.uuid,
+          activeTafIndex: activeTafIndex,
+          index: index,
+          tafFromBackend: tafFromBackend,
+          onPostTaf: onPostTaf
+        });
+      }))), /*#__PURE__*/React__default["default"].createElement(material.Grid, {
+        item: true,
+        xs: 3,
+        sx: {
+          height: '100%'
+        },
+        display: {
+          xs: 'none',
+          sm: 'block'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(TacOverview, {
+        upcomingTafs: upcoming,
+        currentTafs: current,
+        expiredTafs: expired,
+        activeTaf: activeTaf
+      })))))));
+    };
 
-      var onFormAction = function onFormAction(action, taf) {
-        // Add right actions and their follow up calls to the BE
-        switch (action) {
-          case 'CLOSE':
-            confirmDialog({
-              title: 'Closing TAF',
-              description: 'Are you sure you want to close this TAF?  Any changes made will be lost.',
-              confirmLabel: 'Close'
-            }).then(function () {
-              toggleTafDialog();
-            });
-            break;
+    var TafModule = function TafModule() {
+      var api$1 = api.useApiContext().api;
 
-          case 'DRAFT':
-          case 'DRAFT_AMEND':
-          case 'DRAFT_CORRECT':
-          case 'PUBLISH':
-          case 'AMEND':
-          case 'CORRECT':
-            postTaf({
-              taf: taf,
-              changeStatusTo: fromActionToStatus(action)
-            });
-            break;
+      var _a = __read(React__namespace.useState(false), 2),
+          isLoading = _a[0],
+          setLoading = _a[1];
 
-          default:
-            toggleTafDialog();
-            break;
-        }
+      var _b = api.useApi(api$1.getTafList),
+          getTafListError = _b.error,
+          isFetchingInitial = _b.isLoading,
+          tafList = _b.result,
+          fetchNewTafList = _b.fetchApiData;
+
+      shared.usePoller([tafList, getTafListError], function () {
+        return fetchNewTafList({});
+      });
+
+      var reFetchNewTafList = function reFetchNewTafList() {
+        return __awaiter(void 0, void 0, void 0, function () {
+          return __generator(this, function (_a) {
+            switch (_a.label) {
+              case 0:
+                _a.trys.push([0, 2,, 3]);
+
+                setLoading(true);
+                return [4
+                /*yield*/
+                , fetchNewTafList({})];
+
+              case 1:
+                _a.sent();
+
+                setLoading(false);
+                return [3
+                /*break*/
+                , 3];
+
+              case 2:
+                _a.sent();
+                setLoading(false);
+                return [3
+                /*break*/
+                , 3];
+
+              case 3:
+                return [2
+                /*return*/
+                ];
+            }
+          });
+        });
       };
 
-      var selectedTaf = getSelectedTaf(selectedTafId, tafList);
-      return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(TafList, {
+      var hasTafListError = getTafListError !== null;
+
+      if (isFetchingInitial) {
+        return /*#__PURE__*/React__namespace.createElement(LinearProgress__default["default"], {
+          color: "secondary",
+          "data-testid": "loading-bar"
+        });
+      }
+
+      return /*#__PURE__*/React__namespace.createElement(material.Box, {
+        component: "div",
+        id: "tafmodule",
+        sx: {
+          height: '100%'
+        }
+      }, isLoading && /*#__PURE__*/React__namespace.createElement(LinearProgress__default["default"], {
+        "data-testid": "loading-bar",
+        color: "secondary",
+        sx: {
+          marginBottom: '-4px'
+        }
+      }), hasTafListError && /*#__PURE__*/React__namespace.createElement(shared.AlertBanner, {
+        severity: "error",
+        title: "An error has occurred while retrieving the list",
+        info: getTafListError.message
+      }), /*#__PURE__*/React__namespace.createElement(TafLayout, {
         tafList: tafList,
-        isLoading: isLoadingList,
-        error: errorList,
-        onClickTafActionButton: onClickTafActionButton,
-        errorCancelTaf: errorCancelTaf
-      }), showSpinner && /*#__PURE__*/React__default["default"].createElement(Spinner, null), selectedTaf !== undefined && /*#__PURE__*/React__default["default"].createElement(TafFormDialog, {
-        open: isTafDialogOpen,
-        toggleFormDialog: toggleTafDialog,
-        tafFromBackend: selectedTaf,
-        alertBanner: errorPostMessage ? /*#__PURE__*/React__default["default"].createElement(shared.AlertBanner, {
-          severity: "error",
-          title: "An error has occurred while saving, please try again",
-          info: errorPostMessageText
-        }) : null,
-        onFormAction: onFormAction
-      }, /*#__PURE__*/React__default["default"].createElement(TafFormWrapper, {
-        mode: "edit",
-        tafFromBackend: selectedTaf,
-        tafAction: tafDialogAction,
-        onFormAction: onFormAction
-      }), showSpinner && /*#__PURE__*/React__default["default"].createElement(Spinner, null)));
+        onPostTaf: reFetchNewTafList
+      }));
     };
-    /**
-     * Shows the list of Tafs and allows to create, edit and view Tafs.
-     * Needs to be wrapped in the ApiProvider.
-     *
-     * @example
-     * ```<ApiProvider baseURL="http://test.com"  appURL="http://app.com" auth={auth} onSetAuth={onSetAuth} createApi={createApi}>  authTokenUrl="url/tokenrefresh"<TafWrapper /> </ApiProvider>```
-     */
-
 
-    var ConfirmationWrapper = function ConfirmationWrapper() {
-      return /*#__PURE__*/React__default["default"].createElement(shared.ConfirmationServiceProvider, null, /*#__PURE__*/React__default["default"].createElement(TafWrapper, null));
+    var Wrapper = function Wrapper() {
+      return /*#__PURE__*/React__namespace.createElement(shared.ConfirmationServiceProvider, null, /*#__PURE__*/React__namespace.createElement(TafModule, null));
     };
 
     var createApi = function createApi(url, appUrl, auth, setAuth, authTokenUrl, authClientId) {
@@ -5048,13 +5338,8 @@
       };
     };
 
-    exports.ContentDialog = ContentDialog;
-    exports.TafFormDialog = TafFormDialog;
     exports.TafFormWrapper = TafFormWrapper;
-    exports.TafList = TafList;
-    exports.TafListRow = TafListRow;
-    exports.TafListSection = TafListSection;
-    exports.TafWrapper = ConfirmationWrapper;
+    exports.TafModule = Wrapper;
     exports.createApi = createApi;
 
     Object.defineProperty(exports, '__esModule', { value: true });