Skip to content

Commit

Permalink
Merge branch 'feature/PPF-462' into feature/PPF-464
Browse files Browse the repository at this point in the history
# Conflicts:
#	resources/ts/Components/Integrations/Detail/OrganizersInfo.tsx
  • Loading branch information
Anahkiasen committed Jul 2, 2024
2 parents 7261ef5 + fbebbc1 commit cdf75dd
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
4 changes: 4 additions & 0 deletions app/Search/Sapi3/Sapi3SearchService.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public function findUiTPASOrganizers(string ...$ids): PagedCollection
{
$searchQuery = new SearchQuery();
$searchQuery->setEmbed(true);
if (empty($ids)) {
return new PagedCollection();
}

foreach ($ids as $id) {
$searchQuery->addParameter(new Id($id));
}
Expand Down
7 changes: 4 additions & 3 deletions resources/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
"info": "You only pay when you want to use real data. You can explore all possibilities with test events first."
},
"integration_name": "Integration name",
"description_name": "Give a clear title to your integration and mention the name of the organization or municipality for which the integration is built",
"description_name": "Give a clear title to your integration and mention the name of the organization or municipality for which the integration is built.",
"aim": {
"label": "Integration purpose",
"info": "Provide a clear, motivated description of the integration you want to set up with the publiq platform (max. 200 characters)"
"info": "Provide a clear, motivated description of the integration you want to set up with the publiq platform (max. 200 characters)."
},
"website": {
"label": "Website",
Expand Down Expand Up @@ -169,7 +169,7 @@
"deleted": "Deleted",
"pending_approval_integration": "Pending approval",
"pending_approval_payment": "Pending approval",
"pending_approval_integration_description": "Approval from publiq is necessary for the live integration. All information to smoothly go live can be found <0>here</0>",
"pending_approval_integration_description": "Approval from publiq is necessary for the live integration. All information to smoothly go live can be found <0>here</0>.",
"pending_approval_payment_description": "Ready to work with real data and events? Activate your Search API integration (from €125 per year)",
"here": "here.",
"activate": "Activate"
Expand Down Expand Up @@ -265,6 +265,7 @@
"test": "Test",
"live": "Live",
"status_alert": "Approval from publiq is necessary for the live integration of this project. All information to smoothly go live can be found",
"in_progress": "Your activation request is being processed.",
"uitid_alert": "You can switch to authentication with client credentials. Check <0>here</0> whether this method of authentication is suitable for your application. Once you have requested client credentials, your API key remains valid for another 6 months.",
"uitid_alert_link": "https://docs.publiq.be/docs/authentication/methods/overview",
"action_status": "Request activation",
Expand Down
12 changes: 6 additions & 6 deletions resources/translations/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"action": "Probeer {{type}}",
"uitpas_api": {
"title": "UiTPAS API",
"description": "Ken kortingen toe, ruil voordelen om en spaar punten voor UiTPAS-houders",
"description": "Ken kortingen toe, ruil voordelen om en spaar punten voor UiTPAS-houders.",
"features": [
"Oplossing voor koppeling met ticketing systemen",
"Uitgebreide stap-voor-stap gidsen",
Expand Down Expand Up @@ -107,10 +107,10 @@
"info": "Je betaalt pas wanneer je gebruik wilt maken van echte data. Je probeert eerst alle mogelijkheden met testevenementen."
},
"integration_name": "Naam integratie",
"description_name": "Geef een duidelijk titel aan je integratie en vermeld de naam van de organisatie of gemeente waarvoor de integratie gebouwd wordt",
"description_name": "Geef een duidelijk titel aan je integratie en vermeld de naam van de organisatie of gemeente waarvoor de integratie gebouwd wordt.",
"aim": {
"label": "Doel van de integratie",
"info": "Geef een duidelijke, gemotiveerde beschrijving van de integratie die je met het publiq platform wil opzetten (max. 200 karakters)"
"info": "Geef een duidelijke, gemotiveerde beschrijving van de integratie die je met het publiq platform wil opzetten (max. 200 karakters)."
},
"website": {
"label": "Website",
Expand Down Expand Up @@ -171,7 +171,7 @@
"pending_approval_payment": "In Aanvraag",
"pending_approval_integration_description": "Voor de live-integratie is goedkeuring van publiq nodig. Alle informatie om vlot live te kunnen gaan vind je <0>hier</0>.",
"before_going_live_link": "https://docs.publiq.be/docs/uitdatabank/entry-api/requirements-before-going-live",
"pending_approval_payment_description": "Aan de slag met echte data en evenementen? Activeer je Search API integratie (vanaf 125 euro per jaar)",
"pending_approval_payment_description": "Aan de slag met echte data en evenementen? Activeer je Search API integratie (vanaf 125 euro per jaar).",
"activate": "Activatie aanvragen"
},
"activation_dialog": {
Expand Down Expand Up @@ -247,7 +247,7 @@
"subscription": "Prijsplan",
"to_pay": "Te betalen",
"name": "Naam bedrijf, organisatie of gemeente",
"free_until_live": "Deze integratie draait momenteel op een testomgeving. Je betaalt pas wanneer je integratie actief is op de live-omgeving",
"free_until_live": "Deze integratie draait momenteel op een testomgeving. Je betaalt pas wanneer je integratie actief is op de live-omgeving.",
"address": {
"street": "Straat en nummer",
"postcode": "Postcode",
Expand All @@ -271,7 +271,7 @@
"client_id": "Client id",
"client_secret": "Client secret",
"api_key": "API Key",
"info": "Deze credentials blijven nog {{amount}} geldig en worden definitief verwijderd op {{date}}"
"info": "Deze credentials blijven nog {{amount}} geldig en worden definitief verwijderd op {{date}}."
},
"integration_settings": {
"title": "Instellingen",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const OrganizersSection = ({
});
};

if (!organizers.length) {
if (!organizers?.length) {
return null;
}

Expand Down

0 comments on commit cdf75dd

Please sign in to comment.