From 420c38b0be1c74580eb8bf28e1cf0017dda8872d Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Mon, 16 Nov 2020 13:11:56 +0300
Subject: [PATCH 1/2] feat(plugin-erd-viewer): CB-356 add ERD export
 functionality

CB-356
---
 .../src/HTMLTemplates/head.html.ejs           |  5 ++--
 .../core-blocks/src/Loader/Loader.tsx         |  4 ++-
 webapp/packages/core-blocks/src/index.ts      |  1 +
 .../core-utils/src/generateFileName.ts        | 12 ++++++++
 webapp/packages/core-utils/src/index.ts       |  1 +
 webapp/typings.d.ts                           | 29 +++++++++++++++++++
 6 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 webapp/packages/core-utils/src/generateFileName.ts

diff --git a/webapp/packages/core-blocks/src/HTMLTemplates/head.html.ejs b/webapp/packages/core-blocks/src/HTMLTemplates/head.html.ejs
index 351922cb6d..d751d941ce 100644
--- a/webapp/packages/core-blocks/src/HTMLTemplates/head.html.ejs
+++ b/webapp/packages/core-blocks/src/HTMLTemplates/head.html.ejs
@@ -3,6 +3,7 @@
 <meta content="text/html; charset=utf-8" />
 <link rel="alternate icon" type="image/png" href="favicon.png" sizes="16х16">
 <link rel="icon" type="image/svg+xml" href="favicon.svg">
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="preload" as="font" />
-<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet" />
+<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="preload" as="font"
+  crossorigin="anonymous" />
+<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet" crossorigin="anonymous" />
 <link rel="prefetch" href="icons/icons.svg" as="image" type="image/svg+xml" />
\ No newline at end of file
diff --git a/webapp/packages/core-blocks/src/Loader/Loader.tsx b/webapp/packages/core-blocks/src/Loader/Loader.tsx
index 2ed88b0e0f..8cd9e215c7 100644
--- a/webapp/packages/core-blocks/src/Loader/Loader.tsx
+++ b/webapp/packages/core-blocks/src/Loader/Loader.tsx
@@ -20,6 +20,7 @@ interface Props {
   loading?: boolean;
   /** disable cancel button */
   cancelDisabled?: boolean;
+  message?: string;
   /** hides message */
   hideMessage?: boolean;
   /** render loader as overlay with white spinner */
@@ -41,6 +42,7 @@ const spinnerType = {
 export const Loader: React.FC<Props> = function Loader({
   cancelDisabled,
   overlay,
+  message,
   hideMessage,
   secondary,
   small,
@@ -72,7 +74,7 @@ export const Loader: React.FC<Props> = function Loader({
   return styled(style)(
     <loader as="div" className={className} {...use({ small, fullSize })}>
       <icon as="div"><img src={spinnerURL} /></icon>
-      {!hideMessage && <message as="div"><Translate token='ui_processing_loading' /></message>}
+      {!hideMessage && <message as="div"><Translate token={message || 'ui_processing_loading'} /></message>}
       {onCancel && (
         <actions as='div'>
           <Button
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index b3c95d16e0..343e0541ed 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -48,6 +48,7 @@ export * from './StaticImage';
 export * from './TextPlaceholder';
 export * from './useClipboard';
 export * from './useFocus';
+export * from './useErrorDetails';
 export * from './useAppLoadingScreen';
 export * from './BlocksLocaleService';
 export * from './Snackbars/NotificationMark';
diff --git a/webapp/packages/core-utils/src/generateFileName.ts b/webapp/packages/core-utils/src/generateFileName.ts
new file mode 100644
index 0000000000..858e724cd0
--- /dev/null
+++ b/webapp/packages/core-utils/src/generateFileName.ts
@@ -0,0 +1,12 @@
+/*
+ * cloudbeaver - Cloud Database Manager
+ * Copyright (C) 2020 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+
+export function generateFileName(fileName: string, fileFormat: string) {
+  const now = new Date();
+  return `${fileName}_${now.toISOString().slice(0, 10)}_${('0' + now.getHours()).slice(-2)}-${('0' + now.getMinutes()).slice(-2)}-${('0' + now.getSeconds()).slice(-2)}${fileFormat}`;
+}
diff --git a/webapp/packages/core-utils/src/index.ts b/webapp/packages/core-utils/src/index.ts
index d49cb01fe5..30f0942306 100644
--- a/webapp/packages/core-utils/src/index.ts
+++ b/webapp/packages/core-utils/src/index.ts
@@ -3,6 +3,7 @@ export * from './MetadataMap';
 export * from './OrderedMap';
 export * from './parseJSONFlat';
 export * from './uuid_';
+export * from './generateFileName';
 
 export * from './Promises/CancellablePromise';
 export * from './Promises/Deferred';
diff --git a/webapp/typings.d.ts b/webapp/typings.d.ts
index e140c45f05..a54838dd35 100644
--- a/webapp/typings.d.ts
+++ b/webapp/typings.d.ts
@@ -69,3 +69,32 @@ declare module 'reshadow' {
 
   export default styled
 }
+
+declare module 'save-svg-as-png' {
+  export type SourceElement = HTMLElement | SVGElement | Element;
+
+  export type BackgroundStyle = string | CanvasGradient | CanvasPattern;
+
+  export type SelectorRemap = (text: string) => string;
+
+  export interface SaveSVGOptions {
+    scale?: number;
+    responsive?: boolean;
+    width?: number;
+    height?: number;
+    left?: number;
+    top?: number;
+    selectorRemap?: SelectorRemap;
+    backgroundColor?: BackgroundStyle;
+  }
+
+  export type UriCallback = (uri: string) => void;
+
+  export function svgAsDataUri(el: SourceElement, options: SaveSVGOptions, cb: UriCallback): void;
+
+  export function svgAsPngUri(el: SourceElement, options: SaveSVGOptions, cb: UriCallback): void;
+
+  export function saveSvg(el: SourceElement, fileName: string, options?: SaveSVGOptions): Promise<void>;
+
+  export function saveSvgAsPng(el: SourceElement, fileName: string, options?: SaveSVGOptions): Promise<void>;
+}

From 97c0dafba886fe28576b1c7e657a2d4c4e52a9dc Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Mon, 16 Nov 2020 18:20:16 +0300
Subject: [PATCH 2/2] feat(plugin-erd-viewer): CB-356 remove save-svg-as-png
 from public typings

---
 webapp/typings.d.ts | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/webapp/typings.d.ts b/webapp/typings.d.ts
index a54838dd35..e140c45f05 100644
--- a/webapp/typings.d.ts
+++ b/webapp/typings.d.ts
@@ -69,32 +69,3 @@ declare module 'reshadow' {
 
   export default styled
 }
-
-declare module 'save-svg-as-png' {
-  export type SourceElement = HTMLElement | SVGElement | Element;
-
-  export type BackgroundStyle = string | CanvasGradient | CanvasPattern;
-
-  export type SelectorRemap = (text: string) => string;
-
-  export interface SaveSVGOptions {
-    scale?: number;
-    responsive?: boolean;
-    width?: number;
-    height?: number;
-    left?: number;
-    top?: number;
-    selectorRemap?: SelectorRemap;
-    backgroundColor?: BackgroundStyle;
-  }
-
-  export type UriCallback = (uri: string) => void;
-
-  export function svgAsDataUri(el: SourceElement, options: SaveSVGOptions, cb: UriCallback): void;
-
-  export function svgAsPngUri(el: SourceElement, options: SaveSVGOptions, cb: UriCallback): void;
-
-  export function saveSvg(el: SourceElement, fileName: string, options?: SaveSVGOptions): Promise<void>;
-
-  export function saveSvgAsPng(el: SourceElement, fileName: string, options?: SaveSVGOptions): Promise<void>;
-}