Enhancement/contract update

public/translations/amh-ETH.json

@@ -1249,5 +1249,11 @@
     "eos_plural": "Eos",
     "eth_plural": "ቢትኮይን",
     "usd_plural": "ዶላር"
+  },
+  "permissions": {
+    "insufficient": "እርምጃ አይፈቀድም",
+    "explanation": "ይህን እርምጃ ለመፈጸም የሚያስፈልጉት ፈቃዶች የሎትም። ተጨማሪ ፈቃዶችን እንዴት ማግኘት እንደሚችሉ ለማወቅ የማህበረሰብ አስተዳዳሪዎችን ያግኙ።",
+    "try_again": "እባክዎ በቂ ፍቃዶች ካገኙ በኋላ እንደገና ይሞክሩ!",
+    "ok": "ገብቶኛል"
   }
 }

public/translations/cat-CAT.json

@@ -1290,5 +1290,13 @@
     "eos_plural": "Eos",
     "eth_plural": "Ethereum",
     "usd_plural": "Dòlars"
+  },
+  "permissions": {
+    "insufficient": {
+      "title": "Acció no permesa",
+      "explanation": "No teniu els permisos necessaris per dur a terme aquesta acció. Poseu-vos en contacte amb els administradors de la comunitat per saber com obtenir més permisos.",
+      "try_again": "Si us plau, torneu-ho a provar quan tingueu prou permisos!",
+      "ok": "Entès"
+    }
   }
 }

public/translations/en-US.json

@@ -1288,5 +1288,13 @@
     "eos_plural": "Eos",
     "eth_plural": "Ethereum",
     "usd_plural": "Dollars"
+  },
+  "permissions": {
+    "insufficient": {
+      "title": "Action not allowed",
+      "explanation": "You don't have the permissions needed to perform this action. Reach out to the community admins to know how to get more permissions.",
+      "try_again": "Please try again once you have enough permissions!",
+      "ok": "Got it"
+    }
   }
 }

public/translations/es-ES.json

@@ -1291,5 +1291,13 @@
     "eos_plural": "Eos",
     "eth_plural": "Ethereum",
     "usd_plural": "Dolares"
+  },
+  "permissions": {
+    "insufficient": {
+      "title": "Acción no permitida",
+      "explanation": "No tienes los permisos necesarios para realizar esta acción. Comuníquese con los administradores de la comunidad para saber cómo obtener más permisos.",
+      "try_again": "¡Vuelva a intentarlo una vez que tenga suficientes permisos!",
+      "ok": "Entendí"
+    }
   }
 }

public/translations/pt-BR.json

@@ -1294,5 +1294,13 @@
     "eos_plural": "Eos",
     "eth_plural": "Ethereum",
     "usd_plural": "Dólares"
+  },
+  "permissions": {
+    "insufficient": {
+      "title": "Ação não permitida",
+      "explanation": "Você não tem as permissões necessárias para realizar esta ação. Contate os administradores da comunidade para saber como ganhar mais permissões.",
+      "try_again": "Por favor tente novamente quando tiver permissões o suficiente!",
+      "ok": "Entendi"
+    }
   }
 }

src/elm/Action.elm

@@ -3,6 +3,7 @@ module Action exposing
     , ActionFeedback(..)
     , ClaimingActionStatus(..)
     , Community
+    , ExternalMsg(..)
     , Model
     , Msg(..)
     , Objective
@@ -20,6 +21,7 @@ module Action exposing
     , viewSearchActions
     )
 
+import Cambiatus.Enum.Permission as Permission exposing (Permission)
 import Cambiatus.Enum.VerificationType as VerificationType exposing (VerificationType)
 import Cambiatus.Object
 import Cambiatus.Object.Action as ActionObject
@@ -127,19 +129,29 @@ type Msg
     | Tick Time.Posix
 
 
+type ExternalMsg
+    = SentFeedback Feedback.Model
+    | ShowInsufficientPermissions
+
+
 update :
     Bool
+    -> List Permission
     -> Shared
     -> Symbol
     -> Eos.Name
     -> Msg
     -> Model
-    -> UR.UpdateResult Model Msg Feedback.Model
-update isPinConfirmed shared selectedCommunity accName msg model =
+    -> UR.UpdateResult Model Msg ExternalMsg
+update isPinConfirmed permissions shared selectedCommunity accName msg model =
     let
         { t, tr } =
             shared.translators
 
+        hasPermissions necessaryPermissions =
+            List.all (\permission -> List.member permission permissions)
+                necessaryPermissions
+
         claimOrAskForPin actionId photoUrl code time m =
             if isPinConfirmed then
                 m
@@ -148,7 +160,8 @@ update isPinConfirmed shared selectedCommunity accName msg model =
                         (claimActionPort
                             msg
                             shared.contracts.community
-                            { actionId = actionId
+                            { communityId = selectedCommunity
+                            , actionId = actionId
                             , maker = accName
                             , proofPhoto = photoUrl
                             , proofCode = code
@@ -168,12 +181,18 @@ update isPinConfirmed shared selectedCommunity accName msg model =
                 |> UR.init
 
         ( ActionClaimed action Nothing, _ ) ->
-            { model
-                | status = ClaimInProgress action Nothing
-                , feedback = Nothing
-                , needsPinConfirmation = not isPinConfirmed
-            }
-                |> claimOrAskForPin action.id "" "" 0
+            if hasPermissions [ Permission.Claim ] then
+                { model
+                    | status = ClaimInProgress action Nothing
+                    , feedback = Nothing
+                    , needsPinConfirmation = not isPinConfirmed
+                }
+                    |> claimOrAskForPin action.id "" "" 0
+
+            else
+                { model | status = NotAsked }
+                    |> UR.init
+                    |> UR.addExt ShowInsufficientPermissions
 
         ( ActionClaimed action (Just proofRecord), _ ) ->
             let
@@ -185,21 +204,27 @@ update isPinConfirmed shared selectedCommunity accName msg model =
                         Proof _ Nothing ->
                             ( "", 0 )
             in
-            case proofRecord.image of
-                Just image ->
-                    { model
-                        | status = ClaimInProgress action (Just proofRecord)
-                        , feedback = Nothing
-                        , needsPinConfirmation = not isPinConfirmed
-                    }
-                        |> claimOrAskForPin action.id image proofCode time
+            if hasPermissions [ Permission.Claim ] then
+                case proofRecord.image of
+                    Just image ->
+                        { model
+                            | status = ClaimInProgress action (Just proofRecord)
+                            , feedback = Nothing
+                            , needsPinConfirmation = not isPinConfirmed
+                        }
+                            |> claimOrAskForPin action.id image proofCode time
 
-                Nothing ->
-                    { model
-                        | feedback = Failure (t "community.actions.proof.no_upload_error") |> Just
-                        , needsPinConfirmation = False
-                    }
-                        |> UR.init
+                    Nothing ->
+                        { model
+                            | feedback = Failure (t "community.actions.proof.no_upload_error") |> Just
+                            , needsPinConfirmation = False
+                        }
+                            |> UR.init
+
+            else
+                { model | status = NotAsked }
+                    |> UR.init
+                    |> UR.addExt ShowInsufficientPermissions
 
         ( AgreedToClaimWithProof action, _ ) ->
             { model
@@ -339,7 +364,7 @@ update isPinConfirmed shared selectedCommunity accName msg model =
                         }
                     )
                     GotFormMsg
-                    UR.addExt
+                    (SentFeedback >> UR.addExt)
                     model
 
         ( GotFormMsg subMsg, PhotoUploaderShowed action (Proof formModel proofCode) ) ->
@@ -349,7 +374,7 @@ update isPinConfirmed shared selectedCommunity accName msg model =
                         { model | status = PhotoUploaderShowed action (Proof newForm proofCode) }
                     )
                     GotFormMsg
-                    UR.addExt
+                    (SentFeedback >> UR.addExt)
                     model
 
         ( Tick timer, PhotoUploaderShowed action (Proof photoStatus (Just proofCode)) ) ->
@@ -692,7 +717,8 @@ encode action =
             { symbol = action.objective.community.symbol, amount = amount }
     in
     Encode.object
-        [ ( "action_id", Encode.int action.id )
+        [ ( "community_id", Eos.encodeSymbol action.objective.community.symbol )
+        , ( "action_id", Encode.int action.id )
         , ( "objective_id", Encode.int action.objective.id )
         , ( "description", Markdown.encode action.description )
         , ( "reward", Eos.encodeAsset (makeAsset action.reward) )
@@ -722,6 +748,7 @@ encode action =
         , ( "has_proof_photo", Eos.encodeEosBool (Eos.boolToEosBool action.hasProofPhoto) )
         , ( "has_proof_code", Eos.encodeEosBool (Eos.boolToEosBool action.hasProofCode) )
         , ( "photo_proof_instructions", Markdown.encode (Maybe.withDefault Markdown.empty action.photoProofInstructions) )
+        , ( "image", Encode.string "" )
         ]
 
 
@@ -738,32 +765,26 @@ updateAction accountName shared action =
 
 
 claimActionPort : msg -> String -> ClaimedAction -> Ports.JavascriptOutModel msg
-claimActionPort msg contractsCommunity { actionId, maker, proofPhoto, proofCode, proofTime } =
+claimActionPort msg contractsCommunity action =
     { responseAddress = msg
     , responseData = Encode.null
     , data =
         Eos.encodeTransaction
             [ { accountName = contractsCommunity
               , name = "claimaction"
               , authorization =
-                    { actor = maker
+                    { actor = action.maker
                     , permissionName = Eos.samplePermission
                     }
-              , data =
-                    { actionId = actionId
-                    , maker = maker
-                    , proofPhoto = proofPhoto
-                    , proofCode = proofCode
-                    , proofTime = proofTime
-                    }
-                        |> encodeClaimAction
+              , data = encodeClaimAction action
               }
             ]
     }
 
 
 type alias ClaimedAction =
-    { actionId : Int
+    { communityId : Symbol
+    , actionId : Int
     , maker : Eos.Name
     , proofPhoto : String
     , proofCode : String
@@ -774,7 +795,8 @@ type alias ClaimedAction =
 encodeClaimAction : ClaimedAction -> Encode.Value
 encodeClaimAction c =
     Encode.object
-        [ ( "action_id", Encode.int c.actionId )
+        [ ( "community_id", Eos.encodeSymbol c.communityId )
+        , ( "action_id", Encode.int c.actionId )
         , ( "maker", Eos.encodeName c.maker )
         , ( "proof_photo", Encode.string c.proofPhoto )
         , ( "proof_code", Encode.string c.proofCode )

src/elm/Claim.elm

@@ -145,8 +145,8 @@ pendingValidators claim =
         claim.action.validators
 
 
-encodeVerification : ClaimId -> Eos.Name -> Bool -> Encode.Value
-encodeVerification claimId validator vote =
+encodeVerification : ClaimId -> Eos.Name -> Bool -> Eos.Symbol -> Encode.Value
+encodeVerification claimId validator vote communityId =
     let
         encodedClaimId : Encode.Value
         encodedClaimId =
@@ -163,7 +163,8 @@ encodeVerification claimId validator vote =
                 |> Eos.encodeEosBool
     in
     Encode.object
-        [ ( "claim_id", encodedClaimId )
+        [ ( "community_id", Eos.encodeSymbol communityId )
+        , ( "claim_id", encodedClaimId )
         , ( "verifier", encodedVerifier )
         , ( "vote", encodedVote )
         ]

src/elm/Community.elm

@@ -461,7 +461,7 @@ objectiveSelectionSet =
 
 
 type alias CreateObjectiveAction =
-    { asset : Eos.Asset
+    { communityId : Eos.Symbol
     , description : Markdown
     , creator : Eos.Name
     }
@@ -470,14 +470,16 @@ type alias CreateObjectiveAction =
 encodeCreateObjectiveAction : CreateObjectiveAction -> Value
 encodeCreateObjectiveAction c =
     Encode.object
-        [ ( "cmm_asset", Eos.encodeAsset c.asset )
+        [ ( "community_id", Eos.encodeSymbol c.communityId )
+        , ( "objective_id", Encode.int 0 )
         , ( "description", Markdown.encode c.description )
-        , ( "creator", Eos.encodeName c.creator )
+        , ( "editor", Eos.encodeName c.creator )
         ]
 
 
 type alias UpdateObjectiveAction =
-    { objectiveId : Int
+    { communityId : Eos.Symbol
+    , objectiveId : Int
     , description : Markdown
     , editor : Eos.Name
     }
@@ -486,7 +488,8 @@ type alias UpdateObjectiveAction =
 encodeUpdateObjectiveAction : UpdateObjectiveAction -> Value
 encodeUpdateObjectiveAction c =
     Encode.object
-        [ ( "objective_id", Encode.int c.objectiveId )
+        [ ( "community_id", Eos.encodeSymbol c.communityId )
+        , ( "objective_id", Encode.int c.objectiveId )
         , ( "description", Markdown.encode c.description )
         , ( "editor", Eos.encodeName c.editor )
         ]

src/elm/Page/Community/ActionEditor.elm

@@ -285,6 +285,7 @@ update msg model ({ shared } as loggedIn) =
                         formOutput
                     )
                 |> LoggedIn.withPrivateKey loggedIn
+                    []
                     model
                     { successMsg = msg, errorMsg = ClosedAuthModal }
 
@@ -300,6 +301,7 @@ update msg model ({ shared } as loggedIn) =
                         formOutput
                     )
                 |> LoggedIn.withPrivateKey loggedIn
+                    []
                     model
                     { successMsg = msg, errorMsg = ClosedAuthModal }
 

src/elm/Page/Community/New.elm

@@ -412,6 +412,7 @@ update msg model loggedIn =
                             ]
                     }
                 |> LoggedIn.withPrivateKey loggedIn
+                    []
                     model
                     { successMsg = msg, errorMsg = ClosedAuthModal }
                 |> UR.addBreadcrumb