From 51df7037ddbe491fc487239672837b70a359236a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20A=CC=8Ahle=CC=81n?= Date: Tue, 31 Oct 2023 15:36:55 +0100 Subject: [PATCH 1/2] [frontend] Add a react icon for Google Storage --- .../desktop/js/components/icons/GSIcon.tsx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 desktop/core/src/desktop/js/components/icons/GSIcon.tsx diff --git a/desktop/core/src/desktop/js/components/icons/GSIcon.tsx b/desktop/core/src/desktop/js/components/icons/GSIcon.tsx new file mode 100644 index 00000000000..2ee3003a88d --- /dev/null +++ b/desktop/core/src/desktop/js/components/icons/GSIcon.tsx @@ -0,0 +1,30 @@ +// Licensed to Cloudera, Inc. under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. Cloudera, Inc. licenses this file +// to you under the Apache License, Version 2.0 (the +// 'License'); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an 'AS IS' BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import React, { SVGProps } from 'react'; + +const GSIcon = (props: SVGProps): JSX.Element => ( + + + + + + + + +); + +export default GSIcon; From 5c9bc2be5ec553d43eff2c0a8e36ffbba9cdcb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20A=CC=8Ahle=CC=81n?= Date: Tue, 31 Oct 2023 15:49:11 +0100 Subject: [PATCH 2/2] [fb] Add icon branding for Google Storage --- .../src/filebrowser/templates/fb_components.mako | 2 +- .../core/src/desktop/js/components/sidebar/HueSidebar.vue | 1 + desktop/core/src/desktop/templates/hue_icons.mako | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/filebrowser/src/filebrowser/templates/fb_components.mako b/apps/filebrowser/src/filebrowser/templates/fb_components.mako index f32e54887e2..e353e7546cb 100644 --- a/apps/filebrowser/src/filebrowser/templates/fb_components.mako +++ b/apps/filebrowser/src/filebrowser/templates/fb_components.mako @@ -43,7 +43,7 @@ else: %elif path.lower().find('gs://') == 0:
  • - +
  • %elif path.lower().find('adl:/') == 0: diff --git a/desktop/core/src/desktop/js/components/sidebar/HueSidebar.vue b/desktop/core/src/desktop/js/components/sidebar/HueSidebar.vue index 9a1274cbfce..5973ba3e717 100644 --- a/desktop/core/src/desktop/js/components/sidebar/HueSidebar.vue +++ b/desktop/core/src/desktop/js/components/sidebar/HueSidebar.vue @@ -102,6 +102,7 @@ 'oozie-coordinator': ``, 'oozie-workflow': ``, ofs: ``, + gs: ``, pig: ``, py: ``, pyspark: ``, diff --git a/desktop/core/src/desktop/templates/hue_icons.mako b/desktop/core/src/desktop/templates/hue_icons.mako index b7112c601ca..9dc330c905d 100644 --- a/desktop/core/src/desktop/templates/hue_icons.mako +++ b/desktop/core/src/desktop/templates/hue_icons.mako @@ -132,6 +132,13 @@ + + + + + + + @@ -574,6 +581,7 @@ +