feat: allow staff to access detailed impacts from explorer.

backend/authentication/views.py

@@ -111,6 +111,7 @@ def profile(request):
             "first_name": u.first_name,
             "last_name": u.last_name,
             "organization": u.organization,
+            "staff": u.is_staff,
             "terms_of_use": u.terms_of_use,
             "token": u.token,
         }

backend/tests/authentication/test_profile.py

@@ -29,5 +29,6 @@ def test_authenticated_user_should_access_profile(client):
         "last_name": "",
         "organization": "",
         "terms_of_use": False,
+        "staff": False,
         "token": str(test_user.token),
     }

backend/tests/authentication/test_registration.py

@@ -133,6 +133,7 @@ def test_register_post(client, caplog):
         "first_name": "John",
         "last_name": "Doe",
         "organization": "",
+        "staff": False,
         "terms_of_use": True,
         "token": str(created_user.token),
     }
@@ -171,6 +172,7 @@ def test_as_admin(client):
         "first_name": "",
         "last_name": "",
         "organization": "",
+        "staff": True,
         "terms_of_use": True,
         "token": str(super_user.token),
     }

src/Data/Dataset.elm

@@ -32,13 +32,11 @@ type Dataset
     | Countries (Maybe Country.Code)
     | FoodExamples (Maybe Uuid)
     | FoodIngredients (Maybe Ingredient.Id)
-    | FoodProcesses (Maybe Process.Id)
     | Impacts (Maybe Definition.Trigram)
     | ObjectExamples (Maybe Uuid)
-    | ObjectProcesses (Maybe Process.Id)
+    | Processes Scope (Maybe Process.Id)
     | TextileExamples (Maybe Uuid)
     | TextileMaterials (Maybe Material.Id)
-    | TextileProcesses (Maybe Process.Id)
     | TextileProducts (Maybe Product.Id)
 
 
@@ -50,13 +48,13 @@ datasets scope =
             , Impacts Nothing
             , FoodIngredients Nothing
             , Countries Nothing
-            , FoodProcesses Nothing
+            , Processes Scope.Food Nothing
             ]
 
         Scope.Object ->
             [ ObjectExamples Nothing
             , Components Scope.Object Nothing
-            , ObjectProcesses Nothing
+            , Processes Scope.Object Nothing
             , Impacts Nothing
             ]
 
@@ -66,7 +64,7 @@ datasets scope =
             , Impacts Nothing
             , TextileMaterials Nothing
             , Countries Nothing
-            , TextileProcesses Nothing
+            , Processes Scope.Textile Nothing
             , TextileProducts Nothing
             ]
 
@@ -85,7 +83,7 @@ fromSlug string =
             FoodExamples Nothing
 
         "food-processes" ->
-            FoodProcesses Nothing
+            Processes Scope.Food Nothing
 
         "impacts" ->
             Impacts Nothing
@@ -103,17 +101,20 @@ fromSlug string =
             ObjectExamples Nothing
 
         "object-processes" ->
-            ObjectProcesses Nothing
+            Processes Scope.Object Nothing
 
         "processes" ->
-            TextileProcesses Nothing
+            Processes Scope.Textile Nothing
 
         "products" ->
             TextileProducts Nothing
 
         "textile-components" ->
             Components Scope.Textile Nothing
 
+        "textile-processes" ->
+            Processes Scope.Textile Nothing
+
         _ ->
             TextileExamples Nothing
 
@@ -133,16 +134,13 @@ isDetailed dataset =
         FoodIngredients (Just _) ->
             True
 
-        FoodProcesses (Just _) ->
-            True
-
         Impacts (Just _) ->
             True
 
         ObjectExamples (Just _) ->
             True
 
-        ObjectProcesses (Just _) ->
+        Processes _ (Just _) ->
             True
 
         TextileExamples (Just _) ->
@@ -151,9 +149,6 @@ isDetailed dataset =
         TextileMaterials (Just _) ->
             True
 
-        TextileProcesses (Just _) ->
-            True
-
         TextileProducts (Just _) ->
             True
 
@@ -186,27 +181,21 @@ reset dataset =
         FoodIngredients _ ->
             FoodIngredients Nothing
 
-        FoodProcesses _ ->
-            FoodProcesses Nothing
-
         Impacts _ ->
             Impacts Nothing
 
         ObjectExamples _ ->
             ObjectExamples Nothing
 
-        ObjectProcesses _ ->
-            ObjectProcesses Nothing
+        Processes scope _ ->
+            Processes scope Nothing
 
         TextileExamples _ ->
             TextileExamples Nothing
 
         TextileMaterials _ ->
             TextileMaterials Nothing
 
-        TextileProcesses _ ->
-            TextileProcesses Nothing
-
         TextileProducts _ ->
             TextileProducts Nothing
 
@@ -223,8 +212,8 @@ same a b =
         ( FoodIngredients _, FoodIngredients _ ) ->
             True
 
-        ( FoodProcesses _, FoodProcesses _ ) ->
-            True
+        ( Processes scope1 _, Processes scope2 _ ) ->
+            scope1 == scope2
 
         ( Impacts _, Impacts _ ) ->
             True
@@ -238,15 +227,9 @@ same a b =
         ( ObjectExamples _, ObjectExamples _ ) ->
             True
 
-        ( ObjectProcesses _, ObjectProcesses _ ) ->
-            True
-
         ( TextileMaterials _, TextileMaterials _ ) ->
             True
 
-        ( TextileProcesses _, TextileProcesses _ ) ->
-            True
-
         ( TextileProducts _, TextileProducts _ ) ->
             True
 
@@ -269,27 +252,21 @@ setIdFromString idString dataset =
         FoodIngredients _ ->
             FoodIngredients (Ingredient.idFromString idString)
 
-        FoodProcesses _ ->
-            FoodProcesses (Process.idFromString idString)
-
         Impacts _ ->
             Impacts (Definition.toTrigram idString |> Result.toMaybe)
 
         ObjectExamples _ ->
             ObjectExamples (Uuid.fromString idString)
 
-        ObjectProcesses _ ->
-            ObjectProcesses (Process.idFromString idString)
+        Processes scope _ ->
+            Processes scope (Process.idFromString idString)
 
         TextileExamples _ ->
             TextileExamples (Uuid.fromString idString)
 
         TextileMaterials _ ->
             TextileMaterials (Just (Material.Id idString))
 
-        TextileProcesses _ ->
-            TextileProcesses (Process.idFromString idString)
-
         TextileProducts _ ->
             TextileProducts (Just (Product.Id idString))
 
@@ -314,27 +291,21 @@ strings dataset =
         FoodIngredients _ ->
             { label = "Ingrédients", slug = "ingredients" }
 
-        FoodProcesses _ ->
-            { label = "Procédés", slug = "food-processes" }
-
         Impacts _ ->
             { label = "Impacts", slug = "impacts" }
 
         ObjectExamples _ ->
             { label = "Exemples", slug = "object-examples" }
 
-        ObjectProcesses _ ->
-            { label = "Procédés", slug = "object-processes" }
+        Processes scope _ ->
+            { label = "Procédés", slug = Scope.toString scope ++ "-processes" }
 
         TextileExamples _ ->
             { label = "Exemples", slug = "textile-examples" }
 
         TextileMaterials _ ->
             { label = "Matières", slug = "materials" }
 
-        TextileProcesses _ ->
-            { label = "Procédés", slug = "processes" }
-
         TextileProducts _ ->
             { label = "Produits", slug = "products" }
 
@@ -366,12 +337,6 @@ toRoutePath dataset =
         FoodIngredients Nothing ->
             [ slug dataset ]
 
-        FoodProcesses (Just id) ->
-            [ slug dataset, Process.idToString id ]
-
-        FoodProcesses Nothing ->
-            [ slug dataset ]
-
         Impacts (Just trigram) ->
             [ slug dataset, Definition.toString trigram ]
 
@@ -384,10 +349,10 @@ toRoutePath dataset =
         ObjectExamples Nothing ->
             [ slug dataset ]
 
-        ObjectProcesses (Just id) ->
+        Processes _ (Just id) ->
             [ slug dataset, Process.idToString id ]
 
-        ObjectProcesses Nothing ->
+        Processes _ Nothing ->
             [ slug dataset ]
 
         TextileExamples (Just id) ->
@@ -402,12 +367,6 @@ toRoutePath dataset =
         TextileMaterials Nothing ->
             [ slug dataset ]
 
-        TextileProcesses (Just id) ->
-            [ slug dataset, Process.idToString id ]
-
-        TextileProcesses Nothing ->
-            [ slug dataset ]
-
         TextileProducts (Just id) ->
             [ slug dataset, Product.idToString id ]
 

src/Data/User.elm

@@ -17,6 +17,7 @@ type alias User =
     , email : String
     , firstname : String
     , lastname : String
+    , staff : Bool
     , token : String
     }
 
@@ -33,6 +34,7 @@ decode =
         |> Pipe.required "email" Decode.string
         |> Pipe.required "first_name" Decode.string
         |> Pipe.required "last_name" Decode.string
+        |> Pipe.optional "staff" Decode.bool False
         |> Pipe.required "token" Decode.string
 
 
@@ -44,6 +46,7 @@ encode user =
         , ( "last_name", Encode.string user.lastname )
         , ( "organization", Encode.string user.company )
         , ( "terms_of_use", Encode.bool user.cgu )
+        , ( "staff", Encode.bool user.staff )
         , ( "token", Encode.string user.token )
         ]
 
@@ -68,5 +71,6 @@ form user =
     , firstname = user.firstname
     , lastname = user.lastname
     , next = "/#/auth/authenticated"
+    , staff = False
     , token = ""
     }

src/Page/Auth.elm

@@ -76,6 +76,7 @@ emptyModel { authenticated } =
         , lastname = ""
         , company = ""
         , cgu = False
+        , staff = False
         , token = ""
         }
     , formErrors = Dict.empty
@@ -251,33 +252,41 @@ view session model =
 
 viewAccount : User -> Html Msg
 viewAccount user =
-    div [ class "table-responsive border shadow-sm" ]
-        [ table [ class "table table-striped mb-0" ]
-            [ [ ( "Email", text user.email )
-              , ( "Nom", text user.lastname )
-              , ( "Prénom", text user.firstname )
-              , ( "Organisation", text user.company )
-              , ( "Jeton d'API"
-                , div []
-                    [ code [] [ text user.token ]
-                    , br [] []
-                    , small [ class "text-muted" ]
-                        [ text "Nécessaire pour obtenir les impacts détaillés dans "
-                        , a [ Route.href Route.Api ] [ text "l'API" ]
+    [ Just ( "Email", text user.email )
+    , if user.staff then
+        Just ( "Équipe Ecobalyse", strong [] [ text "Oui" ] )
+
+      else
+        Nothing
+    , Just ( "Nom", text user.lastname )
+    , Just ( "Prénom", text user.firstname )
+    , Just ( "Organisation", text user.company )
+    , Just
+        ( "Jeton d'API"
+        , div []
+            [ code [] [ text user.token ]
+            , br [] []
+            , small [ class "text-muted" ]
+                [ text "Nécessaire pour obtenir les impacts détaillés dans "
+                , a [ Route.href Route.Api ] [ text "l'API" ]
+                ]
+            ]
+        )
+    ]
+        |> List.filterMap
+            (Maybe.map
+                (\( label, htmlValue ) ->
+                    tr []
+                        [ th [] [ text <| label ++ " : " ]
+                        , td [] [ htmlValue ]
                         ]
-                    ]
                 )
-              ]
-                |> List.map
-                    (\( label, htmlValue ) ->
-                        tr []
-                            [ th [] [ text <| label ++ " : " ]
-                            , td [] [ htmlValue ]
-                            ]
-                    )
-                |> tbody []
-            ]
-        ]
+            )
+        |> tbody []
+        |> List.singleton
+        |> table [ class "table table-striped mb-0" ]
+        |> List.singleton
+        |> div [ class "table-responsive border shadow-sm" ]
 
 
 viewLoginRegisterForm : Model -> Html Msg