Handle organizationId (#403)

* Fixes #401

* Review

* Fixes #401: Add organizationId query filter

* Fix review

* Fix yarn lint

* Fix missions routes

* Fix review

* Fix PHP-CS

Co-authored-by: Michel Roca <[email protected]>

Author: vincentchalamon

.github/workflows/ci.yml

@@ -82,6 +82,8 @@ jobs:
 
             - run: yarn install --frozen-lockfile
 
+            - run: bin/console fos:js-routing:dump --format=json --target=assets/js/fos_js_routes.json
+
             - run: yarn encore production
 
             # PHPStan needs the var/cache/test/App_KernelTestContainer.xml file to exist

.gitignore

@@ -36,6 +36,7 @@
 ###> symfony/webpack-encore-bundle ###
 /node_modules/
 /public/build/
+/assets/js/fos_js_routes.json
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###

Makefile

@@ -67,12 +67,15 @@ vendors:
 	bin/node-tools yarn install --pure-lockfile
 
 webpack-build-dev:
+	bin/tools bin/console fos:js-routing:dump --format=json --target=assets/js/fos_js_routes.json
 	bin/node-tools yarn encore dev
 
 webpack-watch-dev:
+	bin/tools bin/console fos:js-routing:dump --format=json --target=assets/js/fos_js_routes.json
 	bin/node-tools yarn encore dev --watch
 
 webpack-build-prod:
+	bin/tools bin/console fos:js-routing:dump --format=json --target=assets/js/fos_js_routes.json
 	bin/node-tools yarn encore production
 
 init-db: start-db

assets/js/_planning-missions.js

@@ -1,5 +1,6 @@
 import { addPopovers } from './_planning';
 import { displayAjaxModal } from './_helpers';
+import Routing from './_routing';
 
 const $ = require('jquery');
 const moment = require('moment');
@@ -14,7 +15,14 @@ function setSlotMisssion(mission, $slot) {
   missionsText += $('<span class="badge badge-secondary">').text(mission.type ? mission.type.name : 'mission')[0].outerHTML;
   missionsText += ' ';
 
-  const url = window.location.pathname.indexOf('organizations') >= 0 ? `/organizations/missions/${mission.id}/modal` : `/user/availability/missions/${mission.id}/modal`;
+  // User part
+  let url = Routing.generate('app_user_availability_mission_modal', { id: mission.id });
+
+  if (window.location.pathname.indexOf('organizations') >= 0 && !!mission?.organization?.id) {
+    // Organization part
+    url = Routing.generate('app_organization_mission_modal', { organization: mission.organization.id, id: mission.id });
+  }
+
   missionsText += $(`<button type="button" class="btn btn-link" data-toggle="ajax-modal" data-href="${url}">`).text(mission.name)[0].outerHTML;
 
   $slot.addClass('mission').data('mission-text', missionsText);
@@ -95,8 +103,16 @@ export function fetchMissions() {
   let url;
 
   if ($('.planning').length) {
-    url = '/organizations/missions/find' + window.location.search;
+    // Organization part
+    url = Routing.generate('app_organization_mission_find_by_filters', {
+      organization: window.location.pathname.replace(/^\/organizations\/(\d+).*$/, '$1'),
+    });
+
+    // Add the form search filters to the request
+    url += window.location.search;
   } else {
+    // User part
+    // Route: app_user_availability_missions or app_user_availability_missions_week
     url = window.location.pathname + '/missions';
   }
 

assets/js/_routing.js

@@ -0,0 +1,6 @@
+import Routing from '../../vendor/friendsofsymfony/jsrouting-bundle/Resources/public/js/router.min.js';
+
+const routes = require('./fos_js_routes.json');
+Routing.setRoutingData(routes);
+
+export default Routing;

assets/js/availabilitable-list.js

@@ -2,7 +2,6 @@ const $ = require('jquery');
 
 $(document).ready(function () {
   $('form[name="organization_selector"] select').on('change', function () {
-    let $selectedOption = $('option:selected', this);
-    window.location = $selectedOption.data('url');
+    window.location = window.location.pathname + '?organizationId=' + $(this).val();
   });
 });

composer.json

@@ -11,6 +11,7 @@
     "beberlei/assert": "^3.2",
     "doctrine/annotations": "^1.8",
     "doctrine/doctrine-fixtures-bundle": "^3.3",
+    "friendsofsymfony/jsrouting-bundle": "^2.5",
     "martin-georgiev/postgresql-for-doctrine": "^1.3",
     "odolbeau/phone-number-bundle": "^3.0",
     "sensio/framework-extra-bundle": "5.*",

composer.lock

@@ -21,4 +21,5 @@
     Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'panther' => true],
     Hautelook\AliceBundle\HautelookAliceBundle::class => ['dev' => true, 'test' => true, 'panther' => true],
     Misd\PhoneNumberBundle\MisdPhoneNumberBundle::class => ['all' => true],
+    FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
 ];

config/bundles.php

@@ -1,26 +1,58 @@
+# {organization} parameter is useless for the moment, but will be useful in ticket https://github.com/crf-devs/resop/issues/338
 _organizations:
     resource: ../src/Controller/Organization/
     type: annotation
     prefix: /organizations
 
-_organizations_planning:
-    resource: ../src/Controller/Organization/Planning
+_organizations_asset_types:
+    resource: ../src/Controller/Organization/AssetType
     type: annotation
-    prefix: /organizations/planning
+    prefix: /organizations/{organization}/assetTypes
+    requirements:
+        organization: '\d+'
 
-_organizations_missions:
-    resource: ../src/Controller/Organization/Mission
+_organizations_children:
+    resource: ../src/Controller/Organization/Children
     type: annotation
-    # TODO Use organization ID
-    prefix: /organizations/missions
+    prefix: /organizations/{organization}/children
+    requirements:
+        organization: '\d+'
 
 _organizations_assets:
     resource: ../src/Controller/Organization/CommissionableAsset
     type: annotation
     prefix: /organizations/{organization}/assets
     requirements:
         organization: '\d+'
-    
+
+_organizations_forecast:
+    resource: ../src/Controller/Organization/Forecast
+    type: annotation
+    prefix: /organizations/{organization}/forecast
+    requirements:
+        organization: '\d+'
+
+_organizations_missions:
+    resource: ../src/Controller/Organization/Mission
+    type: annotation
+    prefix: /organizations/{organization}/missions
+    requirements:
+        organization: '\d+'
+
+_organizations_mission_types:
+    resource: ../src/Controller/Organization/MissionType
+    type: annotation
+    prefix: /organizations/{organization}/mission_type
+    requirements:
+        organization: '\d+'
+
+_organizations_planning:
+    resource: ../src/Controller/Organization/Planning
+    type: annotation
+    prefix: /organizations/{organization}/planning
+    requirements:
+        organization: '\d+'
+
 _organizations_users:
     resource: ../src/Controller/Organization/User
     type: annotation

config/routes.yaml

@@ -0,0 +1,2 @@
+fos_js_routing:
+    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing-sf4.xml"

config/routes/fos_js_routing.yaml

@@ -125,6 +125,10 @@ services:
         arguments:
             $cacheStrategy: '@Twig\CacheExtension\CacheStrategyInterface'
 
+    App\Twig\Extension\OrganizationExtension:
+        arguments:
+            $routingExtension: '@twig.extension.routing'
+
     # declared as public because needed in a migration
     App\Domain\SkillSetDomain:
         public: true

config/services.yaml

@@ -10,7 +10,7 @@ Feature:
 
     Scenario: As an organization, I can list the assets from my organization
         Given I am authenticated as "DT75"
-        And I am on "/organizations"
+        And I am on "/organizations/201"
         When I follow "Afficher la liste de mes véhicules"
         Then I should be on "/organizations/201/assets/"
         And the response status code should be 200
@@ -22,12 +22,12 @@ Feature:
 
     Scenario: As a parent organization, I can list the assets from my children organizations
         Given I am authenticated as "DT75"
-        And I am on "/organizations"
+        And I am on "/organizations/201"
         When I follow "Modifier mes structures"
-        Then I should be on "/organizations/children"
+        Then I should be on "/organizations/201/children/"
         And the response status code should be 200
         When I follow "Liste des véhicules"
-        Then I should be on "/organizations/203/assets/"
+        Then I should be on "/organizations/201/assets/?organizationId=203"
         And the response status code should be 200
         And I should see "75012"
         And I should see "75016"
@@ -104,16 +104,9 @@ Feature:
 
     Scenario: As a parent organization, I cannot update an invalid asset
         Given I am authenticated as "DT75"
-        When I go to "/organizations/201/assets/75012/edit"
+        When I go to "/organizations/201/assets/77102/edit"
         Then the response status code should be 404
 
-    Scenario: As a parent organization, I can delete an asset from my organization or children organizations
-        Given I am on "/organizations/login"
-        When I select "DT75" from "identifier"
-        And I fill in "password" with "covid19"
-        And I press "Je me connecte"
-        Then I should be on "/organizations/"
-
     @javascript
     Scenario: As a parent organization, I can delete an asset from my organization or children organizations
         Given I am authenticated as "DT75"
@@ -122,7 +115,7 @@ Feature:
         And I wait for "#delete-item-modal" to be visible
         Then I should see "Vous êtes sur le point de supprimer le véhicule suivant et toutes ses disponibilités : VPSP - 75012"
         When I press "Supprimer"
-        Then I should be on "/organizations/203/assets/"
+        Then I should be on "/organizations/201/assets/?organizationId=203"
         And I should see "Le véhicule a été supprimé avec succès."
         And I should not see "75012"