Revert "Mijn 6933 cleopatra herindeling (#1039)"

This reverts commit 57a2fbf.

azure-pipeline-bff.yaml

@@ -2,9 +2,8 @@ trigger:
   batch: true
   branches:
     include:
-      - ontwikkelen
       - testen
-      - main
+      - az-acceptance
   paths:
     include:
       - src/server
@@ -51,9 +50,6 @@ parameters:
     default: false
 
 variables:
-  - ${{ if eq(variables['Build.SourceBranchName'], 'ontwikkelen') }}:
-      - name: dtapName
-        value: o
   - ${{ if or(eq(variables['Build.SourceBranchName'], 'testen'), eq(variables['Build.Reason'], 'PullRequest')) }}:
       - name: dtapName
         value: t
@@ -80,3 +76,4 @@ jobs:
       btdAppBFF: true
       btdAppUI: false
       updateAppSettings: ${{ parameters.updateAppSettings }}
+      aquaScan: ${{ eq(variables['Build.Reason'], 'PullRequest') }}

azure-pipeline-ui.yaml

@@ -2,9 +2,8 @@ trigger:
   batch: true
   branches:
     include:
-      - ontwikkelen
       - testen
-      - main
+      - az-acceptance
   paths:
     include:
       - src/client
@@ -81,3 +80,4 @@ jobs:
       btdAppBFF: false
       btdAppUI: true
       updateAppSettings: ${{ parameters.updateAppSettings }}
+      aquaScan: ${{ eq(variables['Build.Reason'], 'PullRequest') }}

src/client/AppState.ts

@@ -60,7 +60,6 @@ export const PRISTINE_APPSTATE: AppState = {
     profileTypes: ['private'],
   }),
   MILIEUZONE: apiPristineResult({ isKnown: false }),
-  OVERTREDINGEN: apiPristineResult({ isKnown: false }),
   TOERISTISCHE_VERHUUR: apiPristineResult({
     vergunningen: [],
     registraties: [],

src/client/assets/icons/index.tsx

@@ -30,11 +30,11 @@ export { default as IconInkomenSVWI } from './inkomen-svwi.svg?react';
 export { default as IconKlachten } from './IconKlachten.svg?react';
 export { default as IconKrefia } from './krefia.svg?react';
 export { default as IconLogout } from './Logout.svg?react';
+// Map icons
 export { default as MapIconHomeCommercial } from './map/homeCommercial__primary-red.svg?react';
 export { default as IconMarker } from './Marker.svg?react';
 export { default as IconMijnGegevens } from './MijnGegevens.svg?react';
 export { default as IconMilieuzone } from './milieuzone.svg?react';
-export { default as IconOvertredingen } from './Overtredingen.svg?react';
 export {
   default as IconIndeterminate,
   default as IconMin,

src/client/components/MainNavSubmenu/MainNavSubmenu.module.scss

@@ -117,7 +117,7 @@
   border-bottom: solid 0.2rem transparent;
 
   @include mq-tablet() {
-    line-height: 1;
+    line-height: 2.5rem;
   }
 }
 

src/client/components/MyChaptersPanel/MyChaptersPanel.tsx

@@ -1,5 +1,6 @@
-import { AppRoutes, ChapterMenuItem } from '../../../universal/config';
+import { AppRoutes } from '../../../universal/config';
 import { ChapterIcons } from '../../config/chapterIcons';
+import { ChapterMenuItem } from '../../config/menuItems';
 import { Heading } from '@amsterdam/design-system-react';
 import { IconInfo } from '../../assets/icons';
 import Linkd from '../Button/Button';

src/client/config/api.ts

@@ -56,7 +56,6 @@ export const ErrorNames: Record<string /* ApiStateKey */, string> = {
   BUURT: 'Mijn buurt / Mijn bedrijfsomgeving',
   BELASTINGEN: 'Actuele updates over uw belastingen',
   MILIEUZONE: 'Milieuzone',
-  OVERTREDINGEN: 'Overtredingen voertuigen',
   MY_LOCATION: 'Uw locatie op de kaart',
   VERGUNNINGEN: 'Vergunningen',
   ALL: 'Alle gegevens', // indien data helemaal niet opgehaald kan worden

src/client/config/chapterIcons.tsx

@@ -5,29 +5,29 @@ import {
   IconAVG,
   IconBelastingen,
   IconBezwaren,
-  IconBodem,
   IconBurgerZaken,
   IconErfpacht,
   IconGarbage,
   IconHomeCommercial,
-  IconHoreca,
   IconInkomen,
   IconInkomenSVWI,
-  IconKlachten,
-  IconKrefia,
   IconMijnGegevens,
   IconMilieuzone,
   IconMyNotifications,
-  IconOvertredingen,
-  IconParkeren,
-  IconSearch,
   IconSiaMeldingen,
   IconStadspas,
-  IconSubsidie,
-  IconToeristischeVerhuur,
+  IconTips,
   IconVergunningen,
-  IconWior,
   IconZorg,
+  IconToeristischeVerhuur,
+  IconKrefia,
+  IconSubsidie,
+  IconSearch,
+  IconWior,
+  IconParkeren,
+  IconKlachten,
+  IconHoreca,
+  IconBodem,
 } from '../assets/icons';
 
 export const ChapterIcons: Record<Chapter, SVGComponent> = {
@@ -42,7 +42,6 @@ export const ChapterIcons: Record<Chapter, SVGComponent> = {
   [Chapters.STADSPAS]: IconStadspas,
   [Chapters.BRP]: IconMijnGegevens,
   [Chapters.MILIEUZONE]: IconMilieuzone,
-  [Chapters.OVERTREDINGEN]: IconOvertredingen,
   [Chapters.SIA]: IconSiaMeldingen,
   [Chapters.NOTIFICATIONS]: IconMyNotifications,
   [Chapters.ROOT]: IconBurgerZaken,

src/server/config.ts

@@ -177,7 +177,7 @@ export const ApiConfig: ApiDataRequestConfig = {
   },
   CLEOPATRA: {
     url: `${process.env.BFF_CLEOPATRA_API_ENDPOINT}`,
-    postponeFetch: !FeatureToggle.cleopatraApiActive,
+    postponeFetch: !FeatureToggle.milieuzoneApiActive,
     method: 'POST',
     httpsAgent: new https.Agent({
       cert: getCert('BFF_SERVER_CLIENT_CERT'),

src/server/mock-data/index.ts

@@ -18,7 +18,7 @@ import KVK1 from './json/kvk-handelsregister.json';
 import KVK2 from './json/kvk-handelsregister2.json';
 import LOODMETING_RAPPORT from './json/loodmeting_rapport.json';
 import LOODMETINGEN from './json/loodmetingen.json';
-import CLEOPATRA from './json/cleopatra.json';
+import MILIEUZONE from './json/milieuzone.json';
 import TOERISTISCHE_VERHUUR_REGISTRATIES_BSN from './json/registraties-toeristische-verhuur-bsn.json';
 import TOERISTISCHE_VERHUUR_REGISTRATIE from './json/registraties-toeristische-verhuur.json';
 import SIA_HISTORY from './json/sia-history.json';
@@ -226,7 +226,7 @@ export const mockDataConfig: MockDataConfig = {
     method: 'post',
     status: (config: any) => (isCommercialUser(config) ? 200 : 200),
     responseData: async (config: any) => {
-      return await loadMockApiResponseJson(CLEOPATRA);
+      return await loadMockApiResponseJson(MILIEUZONE);
     },
   },
   [String(ApiUrls.VERGUNNINGEN)]: {

src/server/mock-data/json/milieuzone.json

@@ -0,0 +1,32 @@
+[
+  {
+    "thema": "Milieuzone",
+    "categorie": "M1",
+    "prioriteit": 0,
+    "datum": "2019-03-13",
+    "titel": "Uw aanvraag ontheffing milieuzone Brom- en snorfietsen",
+    "omschrijving": "Uw moet uw aanvraag voor ontheffing milieuzone Brom- en snorfietsen nog betalen",
+    "url": "https://ontheffingen-acc.amsterdam.nl/publiek/aanvraag/1",
+    "urlNaam": "Betaal direct"
+  },
+  {
+    "thema": "Milieuzone",
+    "categorie": "M1",
+    "prioriteit": 0,
+    "datum": "2019-03-13",
+    "titel": "Uw aanvraag ontheffing milieuzone Brom- en snorfietsen",
+    "omschrijving": "Uw moet uw aanvraag voor ontheffing milieuzone Brom- en snorfietsen nog betalen",
+    "url": "https://ontheffingen-acc.amsterdam.nl/publiek/aanvraag/2",
+    "urlNaam": "Betaal direct"
+  },
+  {
+    "thema": "Milieuzone",
+    "categorie": "F2",
+    "prioriteit": 50,
+    "datum": "2022-06-07",
+    "titel": "milieuzone.f2.aanvragen_en_ontheffingen.titel",
+    "omschrijving": "milieuzone.f2.aanvragen_en_ontheffingen.omschrijving",
+    "url": "https://ontheffingen-acc.amsterdam.nl/publiek/aanvragen",
+    "urlNaam": "milieuzone.f2.aanvragen_en_ontheffingen.button"
+  }
+]

src/server/openapi.yml

@@ -265,8 +265,6 @@ components:
           $ref: '#/components/schemas/ApiSearchConfigResult'
         MILIEUZONE:
           $ref: '#/components/schemas/ApiSearchConfigResult'
-        OVERTREDINGEN:
-          $ref: '#/components/schemas/ApiSearchConfigResult'
         TOERISTISCHE_VERHUUR:
           $ref: '#/components/schemas/ApiSearchConfigResult'
         ERFPACHT:
@@ -327,8 +325,6 @@ components:
           type: object
         MILIEUZONE:
           type: object
-        OVERTREDINGEN:
-          type: object
         TOERISTISCHE_VERHUUR:
           type: object
         SUBSIDIE:

src/server/services/afval/afvalpunten.ts

@@ -2,7 +2,7 @@ import { LatLngLiteral } from 'leaflet';
 import {
   apiSuccessResult,
   getApproximateDistance,
-  sortByNumber,
+  sortAlpha,
 } from '../../../universal/helpers';
 import type {
   AfvalPuntenData,
@@ -22,7 +22,7 @@ function addApproximateDistance(
           : 0,
       });
     })
-    .sort(sortByNumber('distance', 'asc'));
+    .sort(sortAlpha('distance'));
 }
 
 export function fetchAfvalpunten(latlng: LatLngLiteral | null) {