Merge pull request #315 from Cahllagerfeld/cahllagerfeld/adjustments

Updates

Author: htahir1

src/ui/assets/plugin-fallback.svg

@@ -21,7 +21,7 @@ import { DEFAULT_WORKSPACE_NAME, iconColors } from '../../../../constants';
 import { debounce } from '../../../../utils/memo';
 import { PluginsLayout } from '../shared/Layout';
 import { useHubToken, useHubUser } from '../../../hooks/auth';
-import ZenMLLogo from '../../../assets/logo.svg';
+import PluginFallbackImage from '../../../assets/plugin-fallback.svg';
 import { getPlugins, getStarredPlugins, starPlugin } from '../api';
 import { hubConnectionPromptActionTypes } from '../../../../redux/actionTypes';
 import { Filters } from './Filters';
@@ -161,7 +161,7 @@ const ListPlugins: React.FC = () => {
                     )}
                     {/* logo */}
                     <img
-                      src={p.logo_url || ZenMLLogo}
+                      src={p.logo_url || PluginFallbackImage}
                       alt={`${p.name} logo`}
                       style={{
                         height: '80px',

src/ui/layouts/plugins/ListPlugins/index.tsx

@@ -35,7 +35,7 @@ import {
   // deletePlugin,
 } from '../api';
 import { hubConnectionPromptActionTypes } from '../../../../redux/actionTypes';
-import ZenMLLogo from '../../../assets/logo.svg';
+import PluginFallbackImage from "../../../assets/plugin-fallback.svg"
 import { OverviewTab } from './OverviewTab';
 
 export const translate = getTranslateByScope('ui.layouts.Plugins.list');
@@ -133,7 +133,7 @@ const PluginDetail: React.FC = () => {
                       }}
                     >
                       <img
-                        src={plugin.logo_url || ZenMLLogo}
+                        src={plugin.logo_url || PluginFallbackImage}
                         alt={`${plugin.name} logo`}
                         style={{
                           height: '80px',

src/ui/layouts/plugins/PluginDetail/index.tsx

@@ -49,7 +49,7 @@ const UpdatePlugin: React.FC = () => {
   const [releaseNotes, setReleaseNotes] = useState('');
 
   useEffect(() => {
-    getPlugin(pluginId).then((p) => {
+    getPlugin(pluginId, false).then((p) => {
       setPlugin(p);
       if (!repositoryUrl) setRepositoryUrl(p.repository_url);
       if (!repositoryBranch && p.repository_branch)
@@ -214,20 +214,6 @@ const UpdatePlugin: React.FC = () => {
               />
             </Box>
 
-            {/* logo URL */}
-            <Box marginBottom="lg">
-              <InputWithLabel
-                label="Logo URL (optional)"
-                InputComponent={
-                  <TextInput
-                    value={logoUrl}
-                    onChangeText={setLogoUrl}
-                    placeholder="Logo URL"
-                  />
-                }
-              />
-            </Box>
-
             {/* release notes */}
             <Box marginBottom="lg">
               <InputWithLabel

src/ui/layouts/plugins/UpdatePlugin/index.tsx

@@ -24,9 +24,16 @@ const addCanonicalUrl = <X extends TPluginDetail | TPluginVersion>(
   return plugin;
 };
 
-export const getPlugin = async (pluginId: string): Promise<TPluginDetail> => {
+export const getPlugin = async (
+  pluginId: string,
+  available = true,
+): Promise<TPluginDetail> => {
   const plugin = (
-    await axios.get(`${HUB_API_URL}/plugins/${pluginId}?status=available`)
+    await axios.get(
+      `${HUB_API_URL}/plugins/${pluginId}${
+        available ? '?status=available' : ''
+      }`,
+    )
   ).data as TPluginDetail;
   return addCanonicalUrl(plugin);
 };

src/ui/layouts/plugins/api.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { useHistory } from 'react-router-dom';
 
 import { Box, LinkBox, Paragraph } from '../../components';
-import ZenMLLogo from '../../assets/logo.svg';
+import PluginFallbackImage from '../../assets/plugin-fallback.svg';
 
 export const PluginCard: React.FC<{
   title: string;
@@ -34,7 +34,7 @@ export const PluginCard: React.FC<{
       >
         <div>
           <img
-            src={logoUrl ?? ZenMLLogo}
+            src={logoUrl ?? PluginFallbackImage}
             alt={`${title} logo`}
             style={{
               maxWidth: '60%',

src/ui/layouts/settings/PluginCard.tsx

@@ -21,7 +21,7 @@ import { HUB_API_URL } from '../../../api/constants';
 import { useHubToken } from '../../hooks/auth';
 import { useHistory, useToaster } from '../../hooks';
 import { EmptyState } from '../common/EmptyState';
-import ZenMLLogo from '../../assets/logo.svg';
+import PluginFallbackImage from '../../assets/plugin-fallback.svg';
 import { hubConnectionPromptActionTypes } from '../../../redux/actionTypes';
 
 type AugmentedPluginVersion = TPluginVersion & {
@@ -134,7 +134,7 @@ export const Plugins: React.FC = () => {
               >
                 {/* image */}
                 <img
-                  src={p.logo_url || ZenMLLogo}
+                  src={p.logo_url || PluginFallbackImage}
                   alt={`${p.name} logo`}
                   style={{
                     width: '80px',
@@ -214,7 +214,7 @@ export const Plugins: React.FC = () => {
                 {m.plugins.map((p, i) => (
                   <PluginCard
                     key={i}
-                    logoUrl={p.logo_url || ZenMLLogo}
+                    logoUrl={p.logo_url || PluginFallbackImage}
                     title={p.name}
                     description={`${p.version}: ${
                       p.description ?? 'No plugin description'
@@ -249,7 +249,7 @@ export const Plugins: React.FC = () => {
                 {m.plugins.map((p, i) => (
                   <PluginCard
                     key={i}
-                    logoUrl={p.logo_url || ZenMLLogo}
+                    logoUrl={p.logo_url || PluginFallbackImage}
                     title={p.name}
                     description={`${p.version}: ${
                       p.description ?? 'No plugin description'