From d73c349fb2d65924995e2cbc0095fe483e4255d0 Mon Sep 17 00:00:00 2001 From: Travis Baka Date: Mon, 5 Feb 2024 15:06:10 -0600 Subject: [PATCH 1/7] feat: [OCA-1273: Feb 2024 Apps] adds SVGs + oneClickAps.ts entry for NATS and JupyterLab. updates stackScriptUtils.ts --- packages/manager/public/assets/jupyter.svg | 49 +++++++++++++++++++ packages/manager/public/assets/nats.svg | 10 ++++ .../manager/public/assets/white/juptyer.svg | 49 +++++++++++++++++++ packages/manager/public/assets/white/nats.svg | 15 ++++++ .../src/features/OneClickApps/oneClickApps.ts | 43 ++++++++++++++++ .../features/StackScripts/stackScriptUtils.ts | 2 + 6 files changed, 168 insertions(+) create mode 100644 packages/manager/public/assets/jupyter.svg create mode 100644 packages/manager/public/assets/nats.svg create mode 100644 packages/manager/public/assets/white/juptyer.svg create mode 100644 packages/manager/public/assets/white/nats.svg diff --git a/packages/manager/public/assets/jupyter.svg b/packages/manager/public/assets/jupyter.svg new file mode 100644 index 00000000000..951aa8db798 --- /dev/null +++ b/packages/manager/public/assets/jupyter.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/manager/public/assets/nats.svg b/packages/manager/public/assets/nats.svg new file mode 100644 index 00000000000..3ab2daceb0c --- /dev/null +++ b/packages/manager/public/assets/nats.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/packages/manager/public/assets/white/juptyer.svg b/packages/manager/public/assets/white/juptyer.svg new file mode 100644 index 00000000000..bf2c5ca816d --- /dev/null +++ b/packages/manager/public/assets/white/juptyer.svg @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/manager/public/assets/white/nats.svg b/packages/manager/public/assets/white/nats.svg new file mode 100644 index 00000000000..246e6d1e4cf --- /dev/null +++ b/packages/manager/public/assets/white/nats.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/packages/manager/src/features/OneClickApps/oneClickApps.ts b/packages/manager/src/features/OneClickApps/oneClickApps.ts index c165941c8fe..07bd68abf02 100644 --- a/packages/manager/src/features/OneClickApps/oneClickApps.ts +++ b/packages/manager/src/features/OneClickApps/oneClickApps.ts @@ -905,6 +905,27 @@ export const oneClickApps: OCA[] = [ summary: 'Open source multimedia note-taking app.', website: 'https://joplinapp.org/', }, + { + alt_description: 'Data science notebook.', + alt_name: 'Data science and machine learning development enviornment.', + categories: ['Productivity'], + colors: { + end: '9e9e9e', + start: 'f37626', + }, + description: 'JupyterLab is a cutting-edge web-based, interactive development enviornment, geared towards data science, machine learning and other scientific computing workflows.', + logo_url: 'jupyter.svg', + name: 'JupyterLab', + related_guides: [ + { + href: + 'https://www.linode.com/docs/products/tools/marketplace/guides/jupyterlab/', + title: 'Deploy JupyterLab through the Linode Marketplace', + }, + ], + sumary: 'Data science development envirnoment.', + website: 'https://jupyter.org', + }, { alt_description: 'Security research and testing platform with hundreds of tools for reverse engineering, penetration testing, and more.', @@ -1298,6 +1319,28 @@ export const oneClickApps: OCA[] = [ summary: `World's most popular open source database.`, website: 'https://www.mysql.com/', }, + { + alt_description: + `Microservice centeric stream processing.`, + alt_name: 'Microservice messaging bus', + categories: ['Development'], + colors: { + end: '000000', + start: '0086FF', + }, + description: 'NATS is an distributed PubSub technology that enables applications to securely communicate across any combination of cloud vendors, on-premise, edge, web and mobile, and devices.', + logo_url: 'nats.svg', + name: 'NATS Single Node', + related_guides: [ + { + href: + 'https://www.linode.com/docs/products/tools/marketplace/guides/nats-single-node/', + title: 'Deploy NATS single node through the Linode Marketplace', + }, + ], + summary: 'Cloud native application messaging service.', + website: 'https://nats.io', + }, { alt_description: 'File storage alternative to Dropbox and office suite alternative to Microsoft Office.', diff --git a/packages/manager/src/features/StackScripts/stackScriptUtils.ts b/packages/manager/src/features/StackScripts/stackScriptUtils.ts index 6c8f8df9694..669b13829c0 100644 --- a/packages/manager/src/features/StackScripts/stackScriptUtils.ts +++ b/packages/manager/src/features/StackScripts/stackScriptUtils.ts @@ -131,6 +131,8 @@ export const baseApps = { '1243763': 'MainConcept XAVC Transcoder Demo', '1243764': 'MainConcept XDCAM Transcoder Demo', '1243780': 'SimpleX Chat', + '1308539': 'NATS Single Node', + '1298017': 'JupyterLab', }; const oneClickFilter = [ From 95a9fd3d1b2ff024640fc16009395fa424fe7ad7 Mon Sep 17 00:00:00 2001 From: Travis Baka Date: Mon, 5 Feb 2024 15:18:43 -0600 Subject: [PATCH 2/7] change: replace svgs w/ colored --- packages/manager/public/assets/jupyter.svg | 16 ++++++++++------ packages/manager/public/assets/nats.svg | 19 ++++++++++++++++--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/packages/manager/public/assets/jupyter.svg b/packages/manager/public/assets/jupyter.svg index 951aa8db798..959b69e5299 100644 --- a/packages/manager/public/assets/jupyter.svg +++ b/packages/manager/public/assets/jupyter.svg @@ -3,7 +3,11 @@ @@ -31,17 +35,17 @@ c0,1-0.5,1.9-0.5,2.9v16.8h-5.3V111.2L208.7,111.2z"/> - - - - - diff --git a/packages/manager/public/assets/nats.svg b/packages/manager/public/assets/nats.svg index 3ab2daceb0c..d9f01a213ac 100644 --- a/packages/manager/public/assets/nats.svg +++ b/packages/manager/public/assets/nats.svg @@ -3,8 +3,21 @@ - + + + + + + + + + + + From b06f2cf84ba865c1b5bbac1ab2c05ec72713e141 Mon Sep 17 00:00:00 2001 From: tbaka <48444023+tbaka@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:44:13 -0600 Subject: [PATCH 3/7] Update packages/manager/src/features/OneClickApps/oneClickApps.ts Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com> --- packages/manager/src/features/OneClickApps/oneClickApps.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/manager/src/features/OneClickApps/oneClickApps.ts b/packages/manager/src/features/OneClickApps/oneClickApps.ts index 07bd68abf02..fd0b88b18fa 100644 --- a/packages/manager/src/features/OneClickApps/oneClickApps.ts +++ b/packages/manager/src/features/OneClickApps/oneClickApps.ts @@ -907,7 +907,7 @@ export const oneClickApps: OCA[] = [ }, { alt_description: 'Data science notebook.', - alt_name: 'Data science and machine learning development enviornment.', + alt_name: 'Data science and machine learning development environment.', categories: ['Productivity'], colors: { end: '9e9e9e', From 4a60c9d48ae9e14de4b1d57c52d6eb6846252b54 Mon Sep 17 00:00:00 2001 From: tbaka <48444023+tbaka@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:47:34 -0600 Subject: [PATCH 4/7] Apply suggestions from code review Co-authored-by: Mariah Jacobs <114685994+mjac0bs@users.noreply.github.com> --- packages/manager/src/features/OneClickApps/oneClickApps.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/manager/src/features/OneClickApps/oneClickApps.ts b/packages/manager/src/features/OneClickApps/oneClickApps.ts index fd0b88b18fa..4c918ffbfa3 100644 --- a/packages/manager/src/features/OneClickApps/oneClickApps.ts +++ b/packages/manager/src/features/OneClickApps/oneClickApps.ts @@ -913,7 +913,7 @@ export const oneClickApps: OCA[] = [ end: '9e9e9e', start: 'f37626', }, - description: 'JupyterLab is a cutting-edge web-based, interactive development enviornment, geared towards data science, machine learning and other scientific computing workflows.', + description: 'JupyterLab is a cutting-edge web-based, interactive development environment, geared towards data science, machine learning and other scientific computing workflows.', logo_url: 'jupyter.svg', name: 'JupyterLab', related_guides: [ @@ -923,7 +923,7 @@ export const oneClickApps: OCA[] = [ title: 'Deploy JupyterLab through the Linode Marketplace', }, ], - sumary: 'Data science development envirnoment.', + summary: 'Data science development environment.', website: 'https://jupyter.org', }, { From 5ee684ffafef4415d0002985a75e922839b68e12 Mon Sep 17 00:00:00 2001 From: tbaka <48444023+tbaka@users.noreply.github.com> Date: Fri, 9 Feb 2024 10:09:25 -0600 Subject: [PATCH 5/7] Added changeset: adds Feb 2024 Marketplaces to oneClickApps.ts --- .../.changeset/pr-10149-added-1707494965603.md | 5 +++++ .../manager/src/features/OneClickApps/oneClickApps.ts | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 packages/manager/.changeset/pr-10149-added-1707494965603.md diff --git a/packages/manager/.changeset/pr-10149-added-1707494965603.md b/packages/manager/.changeset/pr-10149-added-1707494965603.md new file mode 100644 index 00000000000..5c69af3e59a --- /dev/null +++ b/packages/manager/.changeset/pr-10149-added-1707494965603.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Added +--- + +adds Feb 2024 Marketplaces to oneClickApps.ts ([#10149](https://github.com/linode/manager/pull/10149)) diff --git a/packages/manager/src/features/OneClickApps/oneClickApps.ts b/packages/manager/src/features/OneClickApps/oneClickApps.ts index 4c918ffbfa3..442669176dc 100644 --- a/packages/manager/src/features/OneClickApps/oneClickApps.ts +++ b/packages/manager/src/features/OneClickApps/oneClickApps.ts @@ -913,14 +913,15 @@ export const oneClickApps: OCA[] = [ end: '9e9e9e', start: 'f37626', }, - description: 'JupyterLab is a cutting-edge web-based, interactive development environment, geared towards data science, machine learning and other scientific computing workflows.', + description: + 'JupyterLab is a cutting-edge web-based, interactive development environment, geared towards data science, machine learning and other scientific computing workflows.', logo_url: 'jupyter.svg', name: 'JupyterLab', related_guides: [ { href: 'https://www.linode.com/docs/products/tools/marketplace/guides/jupyterlab/', - title: 'Deploy JupyterLab through the Linode Marketplace', + title: 'Deploy JupyterLab through the Linode Marketplace', }, ], summary: 'Data science development environment.', @@ -1320,15 +1321,15 @@ export const oneClickApps: OCA[] = [ website: 'https://www.mysql.com/', }, { - alt_description: - `Microservice centeric stream processing.`, + alt_description: `Microservice centeric stream processing.`, alt_name: 'Microservice messaging bus', categories: ['Development'], colors: { end: '000000', start: '0086FF', }, - description: 'NATS is an distributed PubSub technology that enables applications to securely communicate across any combination of cloud vendors, on-premise, edge, web and mobile, and devices.', + description: + 'NATS is a distributed PubSub technology that enables applications to securely communicate across any combination of cloud vendors, on-premise, edge, web and mobile, and devices.', logo_url: 'nats.svg', name: 'NATS Single Node', related_guides: [ From 903d469603df68949cc0e34f813b26d58afefa8f Mon Sep 17 00:00:00 2001 From: tbaka <48444023+tbaka@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:25:55 -0600 Subject: [PATCH 6/7] rename assets/white/jupyter --- packages/manager/public/assets/white/{juptyer.svg => jupyter.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/manager/public/assets/white/{juptyer.svg => jupyter.svg} (100%) diff --git a/packages/manager/public/assets/white/juptyer.svg b/packages/manager/public/assets/white/jupyter.svg similarity index 100% rename from packages/manager/public/assets/white/juptyer.svg rename to packages/manager/public/assets/white/jupyter.svg From 2a7df61d5869a161b0fcd012d6ff5b4856820430 Mon Sep 17 00:00:00 2001 From: Hana Xu Date: Tue, 13 Feb 2024 10:33:06 -0500 Subject: [PATCH 7/7] feature flag new apps --- .../manager/src/features/StackScripts/stackScriptUtils.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/manager/src/features/StackScripts/stackScriptUtils.ts b/packages/manager/src/features/StackScripts/stackScriptUtils.ts index 669b13829c0..c2119a3a9e1 100644 --- a/packages/manager/src/features/StackScripts/stackScriptUtils.ts +++ b/packages/manager/src/features/StackScripts/stackScriptUtils.ts @@ -131,8 +131,9 @@ export const baseApps = { '1243763': 'MainConcept XAVC Transcoder Demo', '1243764': 'MainConcept XDCAM Transcoder Demo', '1243780': 'SimpleX Chat', - '1308539': 'NATS Single Node', - '1298017': 'JupyterLab', + // uncomment after 2/20/24 release + // '1308539': 'NATS Single Node', + // '1298017': 'JupyterLab', }; const oneClickFilter = [