Merge pull request #1620 from LalitDeore/test

Fix - App activation and redirection issue for onprem

frontend/src/components/AppGrid.jsx

@@ -417,8 +417,8 @@ const AppGrid = (props) => {
                   {hits.map((data, index) => {
                     const appUrl =
                               isCloud === true ?
-                              `/apps/${data.id}`
-                                : `https://shuffler.io/apps/${data.objectID}`;
+                              `/apps/${data.objectID}`
+                                : `apps/${data.objectID}`;
 
                               if (data.name === "" && data.id === "") {
                                 return null

frontend/src/components/AppModal.jsx

@@ -590,7 +590,7 @@ const AppModal = ({ open, onClose, app, globalUrl, getApps }) => {
 					</Typography>
 	  			</a>
                 <Link
-                  to={isCloud ? "/apps/" + (app?.id || app?.objectID) : `https://shuffler.io/apps/${app?.objectID || app?.id}`}
+                  to={isCloud ? `/apps/${app?.id || app?.objectID}` : `/apps/${app?.id || app?.published_id || app?.objectID}`}
                   style={{ textDecoration: "none", color: "#f85a3e", marginTop: "-2px" }}
                   target="_blank"
                   rel="noopener noreferrer"

frontend/src/components/SearchData.jsx

@@ -495,7 +495,7 @@ const SearchData = props => {
                                 })
                             }
 
-                            var parsedUrl = isCloud ? `/apps/${hit.objectID}` : `https://shuffler.io/apps/${hit.objectID}`
+                            var parsedUrl = isCloud ? `/apps/${hit.objectID}` : `/apps/${hit.objectID}`
                             parsedUrl += `?queryID=${hit.__queryID}`
 
                             return (