Merge pull request #548 from factly/fix/minor

Fix/minor
factly · May 18, 2022 · a388bbc · a388bbc
2 parents 671455f + e43733c
commit a388bbc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/api/graph/models/medium.go b/api/graph/models/medium.go
@@ -3,6 +3,7 @@ package models
 import (
 	"encoding/json"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/jinzhu/gorm/dialects/postgres"
@@ -37,7 +38,7 @@ func (media *Medium) AfterFind(tx *gorm.DB) (err error) {
 		_ = json.Unmarshal(media.URL.RawMessage, &resurl)
 		if rawURL, found := resurl["raw"]; found {
 			urlObj, _ := url.Parse(rawURL.(string))
-			resurl["proxy"] = viper.GetString("imageproxy_url") + urlObj.Path
+			resurl["proxy"] = strings.Replace(viper.GetString("imageproxy_url")+urlObj.Path, "/dega.factly.in", "", 1)
 
 			rawBArr, _ := json.Marshal(resurl)
 			media.URL = postgres.Jsonb{

diff --git a/server/cmd/reindex-search.go b/server/cmd/reindex-search.go
@@ -1,10 +1,11 @@
 package cmd
 
 import (
-	"log"
+	"errors"
 
 	"github.com/factly/dega-server/config"
 	"github.com/factly/dega-server/util"
+	"github.com/factly/x/loggerx"
 	"github.com/factly/x/meilisearchx"
 	"github.com/spf13/cobra"
 )
@@ -18,23 +19,23 @@ var reindexCommand = &cobra.Command{
 	Short: "Reindex meilisearch index if ENABLE_SEARCH_INDEXING is set true",
 	Run: func(cmd *cobra.Command, args []string) {
 		if !config.SearchEnabled() {
-			log.Fatal("Search indexing not enabled...")
+			loggerx.Error(errors.New("search indexing not enabled"))
 		}
 
 		config.SetupDB()
 
 		err := meilisearchx.SetupMeiliSearch("dega", []string{"name", "slug", "description", "title", "subtitle", "excerpt", "claim", "fact", "site_title", "site_address", "tag_line", "review", "review_tag_line"})
 		if err != nil {
-			log.Fatal(err)
+			loggerx.Error(err)
 		}
 
 		_, err = meilisearchx.Client.Documents("dega").DeleteAllDocuments()
 		if err != nil {
-			log.Fatal(err)
+			loggerx.Error(err)
 		}
 
 		if err = util.ReindexAllEntities(0); err != nil {
-			log.Fatal(err)
+			loggerx.Error(err)
 		}
 
 	},

diff --git a/studio/src/components/GlobalNav/Sidebar.js b/studio/src/components/GlobalNav/Sidebar.js
@@ -139,11 +139,10 @@ function Sidebar({ superOrg, permission, orgs, loading, applications }) {
           padding: collapsed ? '0 0.5rem' : '0 24px',
         }}
       >
-        <Link to="/">
-          <div className="menu-header" style={{}}>
-            <SpaceSelector collapsed={collapsed} />
-          </div>
-        </Link>
+        <div className="menu-header" style={{}}>
+          <SpaceSelector collapsed={collapsed} />
+        </div>
+
         <Search collapsed={collapsed} />
       </div>
       <Menu

diff --git a/studio/src/components/GlobalNav/SpaceSelector.js b/studio/src/components/GlobalNav/SpaceSelector.js
@@ -3,18 +3,15 @@ import { useSelector, useDispatch } from 'react-redux';
 import { Select, Avatar } from 'antd';
 import { setSelectedSpace } from '../../actions/spaces';
 import degaImg from '../../assets/dega.png';
-import { useHistory } from 'react-router-dom';
 
 const { Option, OptGroup } = Select;
 
 function SpaceSelector({ collapsed }) {
   const { orgs, details, selected } = useSelector((state) => state.spaces);
   const dispatch = useDispatch();
-  const history = useHistory();
 
   const handleSpaceChange = (space) => {
     dispatch(setSelectedSpace(space));
-    history.push('/');
   };
 
   return (