Disable the Mock mode which is currently incompatible with servant-multipart

bin/gargantext-server/Main.hs

@@ -27,7 +27,7 @@ import Options.Generic
 import Data.Text (unpack)
 
 import Gargantext.Prelude
-import Gargantext.API (startGargantext, startGargantextMock)
+import Gargantext.API (startGargantext) -- , startGargantextMock)
 
 --------------------------------------------------------
 -- Graph Tests
@@ -73,7 +73,9 @@ main = do
               myIniFile' = case myIniFile of
                   Nothing -> panic "[ERROR] gargantext.ini needed"
                   Just i  -> i
-        _ -> startGargantextMock myPort'
+        Dev -> panic "[ERROR] Dev mode unsupported"
+        Mock -> panic "[ERROR] Mock mode unsupported"
+        -- _ -> startGargantextMock myPort'
 
   putStrLn $ "Starting with " <> show myMode <> " mode."
   start

src/Gargantext/API.hs

@@ -56,7 +56,7 @@ import           Network.Wai.Handler.Warp hiding (defaultSettings)
 
 import           Servant
 import           Servant.HTML.Blaze (HTML)
-import           Servant.Mock (mock)
+--import           Servant.Mock (mock)
 --import           Servant.Job.Server (WithCallbacks)
 import           Servant.Static.TH.Internal.Server (fileTreeToServer)
 import           Servant.Static.TH.Internal.FileTree (fileTypeToFileTree, FileType(FileTypeFile))
@@ -145,7 +145,7 @@ fireWall req fw = do
        then pure True
        else pure False
 
-
+{-
 -- makeMockApp :: Env -> IO (Warp.Settings, Application)
 makeMockApp :: MockEnv -> IO Application
 makeMockApp env = do
@@ -178,7 +178,7 @@ makeMockApp env = do
     
     --pure (warpS, logWare $ checkOriginAndHost $ corsMiddleware $ serverApp)
     pure $ logStdoutDev $ checkOriginAndHost $ corsMiddleware $ serverApp
-
+-}
 
 
 makeDevMiddleware :: IO Middleware
@@ -340,16 +340,16 @@ swaggerFront :: Server SwaggerFrontAPI
 swaggerFront = schemaUiServer swaggerDoc
            :<|> frontEndServer
 
-gargMock :: Server GargAPI
-gargMock = mock apiGarg Proxy
+--gargMock :: Server GargAPI
+--gargMock = mock apiGarg Proxy
 
 ---------------------------------------------------------------------
 makeApp :: (HasConnection env, HasRepo env, HasSettings env)
         => env -> IO Application
 makeApp = fmap (serve api) . server
 
-appMock :: Application
-appMock = serve api (swaggerFront :<|> gargMock :<|> serverStatic)
+--appMock :: Application
+--appMock = serve api (swaggerFront :<|> gargMock :<|> serverStatic)
 
 ---------------------------------------------------------------------
 api :: Proxy API
@@ -414,9 +414,10 @@ startGargantext port file = do
   mid <- makeDevMiddleware
   run port (mid app) `finally` stopGargantext env
 
+{-
 startGargantextMock :: PortNumber -> IO ()
 startGargantextMock port = do
   portRouteInfo port
   application <- makeMockApp . MockEnv $ FireWall False
   run port application
-
+-}

src/Gargantext/API/Upload.hs

@@ -11,14 +11,16 @@ Portability : POSIX
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-{-# LANGUAGE DataKinds          #-}
-{-# LANGUAGE DeriveGeneric      #-}
-{-# LANGUAGE FlexibleContexts   #-}
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE RankNTypes         #-}
-{-# LANGUAGE TemplateHaskell    #-}
-{-# LANGUAGE TypeOperators      #-}
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DeriveGeneric         #-}
+{-# LANGUAGE FlexibleContexts      #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE RankNTypes            #-}
+{-# LANGUAGE TemplateHaskell       #-}
+{-# LANGUAGE TypeOperators         #-}
 
 module Gargantext.API.Upload
   where
@@ -28,27 +30,42 @@ import Gargantext.Prelude
 import Data.Text (Text)
 import Servant
 import Servant.Multipart
+--import Servant.Mock (HasMock(mock))
+import Servant.Swagger (HasSwagger(toSwagger))
 import qualified Data.ByteString.Lazy as LBS
 import Control.Monad
 import Control.Monad.IO.Class
 import Gargantext.API.Types
-import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
-import Data.Swagger
+--import Test.QuickCheck.Arbitrary (Arbitrary, arbitrary)
+--import Data.Swagger
+--import Gargantext.API.Ngrams (TODO)
 
 -- | Upload files
 -- TODO Is it possible to adapt the function according to iValue input ?
 --type API = MultipartForm Mem (MultipartData Mem) :> Post '[JSON] Integer
 
-instance Generic Mem
+-- instance Generic Mem
 
-instance ToSchema Mem
-instance Arbitrary Mem
+--instance ToSchema Mem
+--instance Arbitrary Mem
 
-instance ToSchema (MultipartData Mem)
-instance Arbitrary ( MultipartData Mem)
+--instance ToSchema (MultipartData Mem)
+--instance Arbitrary ( MultipartData Mem)
 
-instance ToSchema (MultipartForm Mem (MultipartData Mem))
-instance Arbitrary (MultipartForm Mem (MultipartData Mem))
+instance HasSwagger (MultipartForm tag a :> sub) where
+  -- TODO
+  toSwagger _ = undefined -- toSwagger (Proxy :: Proxy (TODO :> Post '[JSON] ()))
+--declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy TODO)
+--instance Arbitrary (MultipartForm Mem (MultipartData Mem))
+
+{-
+instance (FromMultipart tag a, MultipartBackend tag, Servant.Multipart.LookupContext context (MultipartOptions tag))
+      => HasMock (MultipartForm tag a :> sub) context where
+  mock _ _ = undefined
+
+instance HasMock (MultipartForm Mem (MultipartData Mem) :> sub) context where
+  mock _ _ = undefined
+-}
 
 type ApiUpload = MultipartForm Mem (MultipartData Mem) :> Post '[JSON] Integer
 -- MultipartData consists in textual inputs,