III-4435 - New Organizer form

src/constants/OfferType.ts

@@ -5,7 +5,10 @@ const OfferTypes = {
   PLACES: 'places',
 } as const;
 
+const ScopeTypes = { ...OfferTypes, ORGANIZERS: 'organizers' };
+
 type OfferType = Values<typeof OfferTypes>;
+type Scope = Values<typeof ScopeTypes>;
 
-export type { OfferType };
-export { OfferTypes };
+export type { OfferType, Scope };
+export { OfferTypes, ScopeTypes };

src/constants/Regex.ts

@@ -0,0 +1,6 @@
+const EMAIL_REGEX: RegExp = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,})+$/;
+const URL_REGEX: RegExp =
+  /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?!&\/=]*)$/;
+const PHONE_REGEX: RegExp = /^[0-9\/\-_.+ ]{0,15}$/;
+
+export { EMAIL_REGEX, PHONE_REGEX, URL_REGEX };

src/hooks/api/offers.ts

@@ -275,7 +275,7 @@ const useAddOfferPriceInfoMutation = (configuration = {}) =>
     ...configuration,
   });
 
-const changeOfferDescription = async ({
+const changeDescription = async ({
   headers,
   eventId,
   language,
@@ -291,9 +291,9 @@ const changeOfferDescription = async ({
     },
   });
 
-const useChangeOfferDescriptionMutation = (configuration = {}) =>
+const useChangeDescriptionMutation = (configuration = {}) =>
   useAuthenticatedMutation({
-    mutationFn: changeOfferDescription,
+    mutationFn: changeDescription,
     mutationKey: 'offers-change-description',
     ...configuration,
   });
@@ -304,7 +304,7 @@ const addOfferImage = async ({ headers, eventId, imageId, scope }) =>
     options: {
       method: 'POST',
       headers,
-      body: JSON.stringify({ mediaObjectId: imageId }),
+      body: JSON.stringify({ mediaObjectId: imageId, id: imageId }),
     },
   });
 
@@ -319,7 +319,7 @@ const addOfferMainImage = async ({ headers, eventId, imageId, scope }) =>
   fetchFromApi({
     path: `/${scope}/${eventId.toString()}/images/main`,
     options: {
-      method: 'POST',
+      method: 'PUT',
       headers,
       body: JSON.stringify({ mediaObjectId: imageId }),
     },
@@ -408,24 +408,19 @@ const useDeleteOfferImageMutation = (configuration = {}) =>
     ...configuration,
   });
 
-const addOfferContactPoint = async ({
-  headers,
-  eventId,
-  contactPoint,
-  scope,
-}) =>
+const addContactPoint = async ({ headers, eventId, contactPoint, scope }) =>
   fetchFromApi({
     path: `/${scope}/${eventId}/contactPoint`,
     options: {
       method: 'PUT',
       headers,
-      body: JSON.stringify({ contactPoint }),
+      body: JSON.stringify({ ...contactPoint }),
     },
   });
 
-const useAddOfferContactPointMutation = (configuration = {}) =>
+const useAddContactPointMutation = (configuration = {}) =>
   useAuthenticatedMutation({
-    mutationFn: addOfferContactPoint,
+    mutationFn: addContactPoint,
     mutationKey: 'offers-add-contact-point',
     ...configuration,
   });
@@ -486,16 +481,16 @@ const useDeleteOfferOrganizerMutation = (configuration = {}) =>
   });
 
 export {
+  useAddContactPointMutation,
   useAddOfferBookingInfoMutation,
-  useAddOfferContactPointMutation,
   useAddOfferImageMutation,
   useAddOfferLabelMutation,
   useAddOfferMainImageMutation,
   useAddOfferOrganizerMutation,
   useAddOfferPriceInfoMutation,
   useAddOfferVideoMutation,
+  useChangeDescriptionMutation,
   useChangeOfferCalendarMutation,
-  useChangeOfferDescriptionMutation,
   useChangeOfferNameMutation,
   useChangeOfferThemeMutation,
   useChangeOfferTypeMutation,

src/hooks/api/organizers.ts

@@ -128,12 +128,11 @@ const getOrganizerById = async ({ headers, id }: GetOrganizerByIdArguments) => {
 };
 
 const useGetOrganizerByIdQuery = (
-  { req, queryClient, id },
+  { id, ...options },
   configuration: UseQueryOptions = {},
 ) =>
   useAuthenticatedQuery({
-    req,
-    queryClient,
+    ...options,
     queryKey: ['organizers'],
     queryFn: getOrganizerById,
     queryArguments: { id },
@@ -213,14 +212,23 @@ const useGetOrganizersByCreatorQuery = (
     ...configuration,
   });
 
+type CreateOrganizerArguments = {
+  headers: Headers;
+  url: string;
+  name: string;
+  address: any;
+  mainLanguage: string;
+  contact: any;
+};
+
 const createOrganizer = ({
   headers,
   url,
   name,
   address,
   mainLanguage,
   contact,
-}) =>
+}: CreateOrganizerArguments) =>
   fetchFromApi({
     path: '/organizers',
     options: {
@@ -243,11 +251,66 @@ const useCreateOrganizerMutation = (configuration: UseMutationOptions = {}) =>
     ...configuration,
   });
 
+type UpdateOrganizerArguments = CreateOrganizerArguments & {
+  organizerId: string;
+};
+
+const updateOrganizer = ({
+  headers,
+  url,
+  organizerId,
+  name,
+  address,
+  mainLanguage,
+  contact,
+}: UpdateOrganizerArguments) =>
+  fetchFromApi({
+    path: `/organizers/${organizerId}`,
+    options: {
+      headers,
+      method: 'PUT',
+      body: JSON.stringify({
+        mainLanguage,
+        name,
+        url,
+        address,
+        contact,
+      }),
+    },
+  });
+
+const useUpdateOrganizerMutation = (configuration: UseMutationOptions = {}) =>
+  useAuthenticatedMutation({
+    mutationFn: updateOrganizer,
+    mutationKey: 'organizers-update',
+    ...configuration,
+  });
+
+const changeLocation = async ({ headers, organizerId, language, location }) => {
+  return fetchFromApi({
+    path: `/organizers/${organizerId.toString()}/address/${language}`,
+    options: {
+      method: 'PUT',
+      headers,
+      body: JSON.stringify(location),
+    },
+  });
+};
+
+const useChangeLocationMutation = (configuration = {}) =>
+  useAuthenticatedMutation({
+    mutationFn: changeLocation,
+    mutationKey: 'organizer-change-location',
+    ...configuration,
+  });
+
 export {
+  useChangeLocationMutation,
   useCreateOrganizerMutation,
   useDeleteOrganizerByIdMutation,
   useGetOrganizerByIdQuery,
   useGetOrganizersByCreatorQuery,
   useGetOrganizersByQueryQuery,
   useGetOrganizersByWebsiteQuery,
+  useUpdateOrganizerMutation,
 };

src/hooks/api/scope.ts

@@ -0,0 +1,23 @@
+import { Scope, ScopeTypes } from '@/constants/OfferType';
+import { useGetOfferByIdQuery } from '@/hooks/api/offers';
+import { useGetOrganizerByIdQuery } from '@/hooks/api/organizers';
+
+const getEntityQueryForScope = (scope: Scope) =>
+  scope === ScopeTypes.ORGANIZERS
+    ? useGetOrganizerByIdQuery
+    : useGetOfferByIdQuery;
+
+const useGetEntityByIdAndScope = ({
+  scope,
+  id,
+  ...rest
+}: {
+  scope: Scope;
+  id: string;
+}) => {
+  const query = getEntityQueryForScope(scope);
+
+  return query({ scope, id, ...rest });
+};
+
+export { getEntityQueryForScope, useGetEntityByIdAndScope };

src/hooks/api/terms.ts

@@ -1,7 +1,8 @@
 import getConfig from 'next/config';
 import { useQuery } from 'react-query';
 
-type TermScope = 'events' | 'places';
+import { Scope } from '@/constants/OfferType';
+
 type TermDomain = 'eventtype' | 'theme' | 'facility';
 
 type Term = {
@@ -13,7 +14,7 @@ type Term = {
     de: string;
     en: string;
   };
-  scope: TermScope[];
+  scope: Scope[];
 };
 
 type EventType = Term & {

src/hooks/useFeatureFlag.ts

@@ -13,6 +13,7 @@ import { useCookiesWithOptions } from './useCookiesWithOptions';
 
 const FeatureFlags = {
   REACT_CREATE: 'react_create',
+  ORGANIZER_CREATE: 'organizer_create',
 } as const;
 
 const createCookieName = (identifier: string) => `ff_${identifier}`;

src/i18n/de.json

@@ -425,7 +425,14 @@
             "text": "Tipp: Fügen Sie einen <1>{{link}}</1> hinzu",
             "link": "Organisator"
           },
-          "completed": "Alle Punkte! Mit dieser Veranstaltung werden Sie punkten!"
+          "location": {
+            "text": "Tipp: Fügen Sie <1>{{link}}</1> hinzu",
+            "link": "Adresseinformationen"
+          },
+          "completed": {
+            "offers": "Alle Punkte! Mit dieser Veranstaltung werden Sie punkten!",
+            "organizers": "Mit dieser Organisation wirst du punkten!"
+          }
         }
       },
       "organizer": {
@@ -444,6 +451,9 @@
           "not_found": "Diese Veranstaltung ist dem UiTPAS noch nicht bekannt."
         }
       },
+      "location": {
+        "title": "Standort"
+      },
       "place": {
         "add_new_label": "Ort nicht gefunden? Neuen Standort hinzufügen"
       },
@@ -479,7 +489,8 @@
       },
       "title": {
         "events": "Stellen Sie sicher, dass Ihr Publikum keine Informationen verpasst",
-        "places": "Stellen Sie sicher, dass Ihr Publikum keine Informationen verpasst"
+        "places": "Stellen Sie sicher, dass Ihr Publikum keine Informationen verpasst",
+        "organizers": "Stellen Sie sicher, dass Ihr Publikum keine Informationen verpasst"
       },
       "title_events": "Machen Sie dieses Ereignis zu etwas Besonderem",
       "title_places": "Heben Sie diesen Standort hervor"
@@ -495,7 +506,6 @@
       },
       "description": "Ab wann soll dies online angezeigt werden?",
       "title": "Wählen Sie ein Veröffentlichungsdatum",
-
       "warning": "Achtung, dieses Datum kann nur einmalig eingestellt werden."
     },
     "duplicate": {
@@ -963,6 +973,32 @@
       "title": "Produktionen"
     }
   },
+  "organizers": {
+    "create": {
+      "title": "Organisation hinzufügen",
+      "step1": {
+        "title": "Welche Organisation möchten Sie hinzufügen?",
+        "save": "Speichern",
+        "name": "Name",
+        "url": "Website",
+        "url_requirements": "Um Organisationen in der UiT-Datenbank einzigartig zu halten, bitten wir jede Organisation um einen eindeutigen und gültigen Hyperlink",
+        "errors": {
+          "name_required": "Name fehlt",
+          "url_required": "URL fehlt",
+          "url_matches": "Ungültige URL",
+          "url_not_unique": "Diese Adresse wird bereits von der Organisation „{{organizerName}}“ verwendet."
+        }
+      },
+      "step2": {
+        "description_tips": "Beschreiben Sie Ihre Organisation mit Begeisterung\nAn welche Zielgruppe richtet sich die Organisation?\nWelche Aktivitäten organisiert diese Organisation?",
+        "save": "Speichern",
+        "pictures": {
+          "title": "Bilder",
+          "intro": "Fügen Sie ein Bild hinzu, damit Besucher Ihre Organisation besser erkennen"
+        }
+      }
+    }
+  },
   "selectionTable": {
     "rowsSelectedCount": "{{count}} Reihe ausgewählt",
     "rowsSelectedCount_plural": "{{count}} Reihen ausgewählt"