Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fb] Add File Browser branding for Google Storage #3517

Merged
merged 2 commits into from
Nov 1, 2023
Merged

[fb] Add File Browser branding for Google Storage #3517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51df703
[frontend] Add a react icon for Google Storage
JohanAhlen Oct 31, 2023
5c9bc2b
[fb] Add icon branding for Google Storage
JohanAhlen Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/filebrowser/src/filebrowser/templates/fb_components.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ else:
%elif path.lower().find('gs://') == 0:
<li style="padding-top: 12px">
<span class="breadcrumb-link homeLink">
<svg class="hi"><use xlink:href='#hi-adls'></use></svg>
<svg class="hi"><use xlink:href='#hi-gs'></use></svg>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xlink:href is deprected, but I guess the usage is all over the place in hue. See https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/xlink:href

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch. Will fix separately.

</span>
</li>
%elif path.lower().find('adl:/') == 0:
Expand Down
30 changes: 30 additions & 0 deletions desktop/core/src/desktop/js/components/icons/GSIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<SVGSVGElement>): JSX.Element => (
<svg viewBox="0 0 32 32" fill="none" fill-rule="evenodd" width="1em" height="1em" {...props}>
<path fill="#5C85DE" d="M0 4h3v11H0zm29 0h3v11h-3z"></path>
<path fill="#3367D6" d="M29 15V4h1.815z"></path>
<path fill="#85A4E6" d="M3 4v11h26V4H3zm12 7H6V8h9v3zm9 .5a2 2 0 110-4 2 2 0 010 4z"></path>
<path fill="#5C85DE" d="M0 17h3v11H0zm29 0h3v11h-3z"></path>
<path fill="#3367D6" d="M29 28V17h1.815z"></path>
<path fill="#85A4E6" d="M3 17v11h26V17H3zm12 7H6v-3h9v3zm9 .5a2 2 0 110-4 2 2 0 010 4z"></path>
</svg>
);

export default GSIcon;
1 change: 1 addition & 0 deletions desktop/core/src/desktop/js/components/sidebar/HueSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
'oozie-coordinator': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-coordinator"></use></svg>`,
'oozie-workflow': `<svg class="hi hi-fw"><use xlink:href="#hi-oozie-workflow"></use></svg>`,
ofs: `<svg class="hi hi-fw"><use xlink:href="#hi-ofs"></use></svg>`,
gs: `<svg class="hi hi-fw"><use xlink:href="#hi-gs"></use></svg>`,
pig: `<svg class="hi hi-fw"><use xlink:href="#hi-pig"></use></svg>`,
py: `<svg class="hi hi-fw"><use xlink:href="#hi-py"></use></svg>`,
pyspark: `<svg class="hi hi-fw"><use xlink:href="#hi-spark"></use></svg>`,
Expand Down
8 changes: 8 additions & 0 deletions desktop/core/src/desktop/templates/hue_icons.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,13 @@
<path d="M599,586H41A41,41,0,0,1,0,545V95A41,41,0,0,1,41,54H246a41,41,0,0,1,41,41v58l312,0a41,41,0,0,1,41,41V545A41,41,0,0,1,599,586ZM41,86a9,9,0,0,0-9,9V545a9,9,0,0,0,9,9H599a9,9,0,0,0,9-9V194a9,9,0,0,0-9-9H287a32,32,0,0,1-32-32V95a9,9,0,0,0-9-9H41Z"></path>
</symbol>

<symbol id="hi-gs" viewBox="0 0 33 33">
<path d="M0 4h 2v 11H 0 zm30 0h 3v 11h -3z"></path>
<path d="M3 4v11h26V4H3zm12 7H6V8h9v3zm9 .5a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"></path>
<path d="M0 17h 2v 11H0 zm30 0h 3v 11h -3z"></path>
<path d="M3 17v11h26V17H3zm12 7H6v-3h9v3zm9 .5a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"></path>
</symbol>

<symbol id="hi-hbase" viewBox="0 0 640 640">
<path d="M367,368.67c-16.45.34-32.91.1-49.36.1v.65c-15.55,0-31.11,0-46.66,0-16.52-.07-29.35,7.31-39.35,19.88-14.42,18.13-25.73,39.07-47.66,50.21-2.42,1.23-4.37,6-4.11,9,.16,1.79,4.77,3.79,7.69,4.64a163.76,163.76,0,0,0,78.94,3.31c37.52-7.56,71.36-22.37,95.73-53.34,5.59-7.1,9.43-15.85,12.75-24.37C377.34,372.69,374.76,368.51,367,368.67ZM58.51,321.38c-3.88-5.34-8.11-11-12.19-16.81-3.21-4.55-6.23-5.58-10.86-1.29C16,321.29,9,366.91,22.14,389.73Zm522.56,9.74c-9.43-1.85-10.34-5.76-14.44-10.84-21.4-26.53-37.3-51.12-65.38-78.58-45.19-47.13-101.35-71.49-166.9-75.12-35.56-2-70.62,1-105.55,6.36-16.8,2.55-27.81-4-35.93-17.47-3.07-5.09-6.34-10.48-7.6-16.16-4.67-21-8.73-42.07-12.61-63.19-1.4-7.64-3.57-9.42-10.67-6.28a40.18,40.18,0,0,0-22.92,26.22c-3,10.23-5.7,21.07-5.54,31.6.37,24.21,2.22,48.42,4.17,72.57,1.09,13.44-.81,25.09-10.12,35.8-10.58,12.18-19.68,25.64-29.51,38.49C62.58,321,33,370.7,13.88,426.17,4.14,454.37-3.34,482.91,1.53,513.26,3.19,523.56,4,534,5.25,544.37c1.47,12.48,18.59,27.47,31.15,27.26,14.42-.24,26.92-6.24,37.83-14.76,19.25-15,40.52-26.36,62.28-37.11,25.92-12.8,49.72-28.77,69.82-49.83,1.48-1.55,2.66-3.39,4.17-5.35-10.25-2.47-19.68-4.3-28.82-7.07-10-3-11.93-10.48-5.22-18.57,2.25-2.71,5.45-4.61,8.1-7,7.7-7,15.9-13.54,22.85-21.22,6.6-7.29,11.64-16,17.77-23.7,11-13.89,25.3-21.72,43.26-22.08,10.78-.21,21.57-.38,32.35-.14,8.52.19,15.33-2.55,22-8,16.41-13.45,30.41-26.92,48-38.74,27.88-15.59,48.79-22.26,75.6-19.57,48.14,4.84,84.07,30.32,113.17,67.22a7.49,7.49,0,0,1,1.78,5.2c-.2,1.95-3,1-3,1S535,347.42,524,336c-6,8.38-9.16,14.13-14.14,20.22-6.79,8.32-15.13,15.55-21,24.45-9.46,14.45-5.43,36,7.36,44.4,1.09-1.67,2.89-3.25,3.14-5,1-6.93,1.55-12.15,9.77-12.69,3.73-.24,1.07-4.59,8.14-5,2.21.17,2,2,4.24,1.87,1.78-.26,2.58-3.33,4.5-4.16,3.82-1.66,8.9-1.45,12.67-1.3,7,.29,10.31-3.38,11.21-7.85.6-2.95.87-5.26,2.32-10.44,3.34,13.34,12,17.36,22.79,17.27,5.09,0,10.33-1.11,15.24-.23,12,.76,14.08,3.45,20.82,6,10.39,3.94,19.83,8.7,23.42,21,1.06-.33,3.14-.59,4.25-2.72s1.08-5,1.17-8.62C641,372.3,620.31,343.33,581.07,331.12ZM158.89,395c9.45-.15,10.87,2,6.9,10.25a17.12,17.12,0,0,0-1.93,5.83c-1.26,15.95-9.1,27.36-22.93,35.25-7,4-13.12,9.51-20.16,13.41-3.86,2.14-9.87,4.42-12.94,2.83-1.65-.85-2.58-3.1-3.36-5.66a29.51,29.51,0,0,1-.69-15.17c5.85-25.08,29.74-46.33,55.12-46.75ZM102,480.32c.1-2.13,9.92-10.58,12.41-10.18s2.34,2.16,2.35,4.71-9.83,11.37-14.57,8.42c-1.11-.95-.47-2.55-.2-3Zm93-8.53c-12.49,11.55-26.42,20.8-40,29.35-10.59,6.67-22.13,11.81-32.88,18.25-16.37,9.8-32.45,20.09-48.62,30.23-12,7.56-23.76,15.95-39.26,15.55.24-1.29.21-2.2.46-2.29C51,557.16,63,546.35,74.14,533.25c6.72-7.91,16.79-13.37,26.11-18.58,19.5-10.89,35.31-25.26,47.35-44.14,8.59-13.47,8.93-12.94,23.17-6.71,7.33,3.2,13.61,4.34,24.18,8ZM424.47,280.64c18.69-.39,27.25,1.78,40.51,4.88,10.5,2.55,17.84,9.57,22.13,15.24-16.72-5.12-25.18-7.87-41.73-9.34-35.57-4.25-66.79,6.86-94.18,29.23-11.58,9.46-23.06,19.18-33.5,29.85-6.17,6.3-6.29,8-21.12,7,13.11-20.29,25.07-40.85,36.78-61.21,37.88-65.85,133.08-54.57,165.8-16.39a38.82,38.82,0,0,1,3.36,5.69s-31-16.56-53.73-16.56c-13.71,0-17.15,1-25.63,2.47-2.24.38-6,2.32-5.95,5.6s4.72,3.15,7.25,3.51ZM624.15,400.4c-9.94-15.39-25-12.06-39-12.12-4.19,0-8.38.22-12.57.37-7.08.26-13-1.4-16.13-8.68-.79-1.87-2.79-4.77-4.44-5.06a3.53,3.53,0,0,0-2.44,2.11c-6.38,13.57-18.76,15.72-31.62,16-7.43.16-13.52,1.19-17.18,8.57-.71,1.43-4.33,3.08-5,2.57-1.59-1.27-3.53-4.16-3-5.61,1.9-5.53,3.91-11.33,7.33-16,8.67-11.76,18.12-22.95,28.06-35.37,4.68,4.94,9.82,10.48,15.11,15.88,4.17,4.27,8.07,9,13,12.26,2.58,1.7,8.17,2,10.3.25,1.84-1.47,2.07-7.37.64-10-2.93-5.45-7.55-10-11.28-15-2.78-3.77-5.26-7.75-8.58-12.68,33.48-6,83.2,34.67,76.85,62.55Z"></path>
</symbol>
Expand Down Expand Up @@ -574,6 +581,7 @@
<!-- ko case: 'report' --><i class="fa fa-fw fa-area-chart"></i><!-- /ko -->
<!-- ko case: 'dist-cp' --><i class="fa fa-fw fa-files-o"></i><!-- /ko -->
<!-- ko case: 'editor' --><svg class="hi hi-fw"><use xlink:href="#hi-editor"></use></svg><!-- /ko -->
<!-- ko case: 'gs' --><svg class="hi hi-fw"><use xlink:href="#hi-gs"></use></svg><!-- /ko -->
<!-- ko case: 'hbase' --><svg class="hi hi-fw"><use xlink:href="#hi-hbase"></use></svg><!-- /ko -->
<!-- ko case: 'hdfs' --><i class="fa fa-fw fa-folder-o"></i><!-- /ko -->
<!-- ko case: 'hive' --><svg class="hi hi-fw"><use xlink:href="#hi-hive"></use></svg><!-- /ko -->
Expand Down
Loading