Migrate am to clipboard-sk.
Also fixup Makefile.
Bug: skia:13929
Change-Id: I2078c66d047b614299425012461db4830e047343
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/608117
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Auto-Submit: Joe Gregorio <jcgregorio@google.com>
diff --git a/am/Makefile b/am/Makefile
index 6994b95..f1790e2 100644
--- a/am/Makefile
+++ b/am/Makefile
@@ -22,7 +22,8 @@
$(BAZEL) test --config=mayberemote modules/...
build-am: generate
- $(BAZEL) build --config=mayberemote //am:alert-manager
+ $(BAZEL) build --config=mayberemote //am/pages/...
+ $(BAZEL) build --config=mayberemote //am/go/alert-manager:alert-manager
release-am: build-am
$(BAZEL) run --config=mayberemote //am:push_alert-manager
diff --git a/am/modules/incident-sk/BUILD.bazel b/am/modules/incident-sk/BUILD.bazel
index 58fc109..eb03451 100644
--- a/am/modules/incident-sk/BUILD.bazel
+++ b/am/modules/incident-sk/BUILD.bazel
@@ -6,7 +6,10 @@
"//am/modules/themes:themes_sass_lib",
],
sass_srcs = ["incident-sk.scss"],
- sk_element_deps = ["//am/modules/silence-sk"],
+ sk_element_deps = [
+ "//am/modules/silence-sk",
+ "//infra-sk/modules/clipboard-sk",
+ ],
ts_deps = [
"//am/modules/json:index_ts_lib",
"//am/modules/paramset:index_ts_lib",
diff --git a/am/modules/incident-sk/incident-sk.scss b/am/modules/incident-sk/incident-sk.scss
index b9a6172..fc2edf5 100644
--- a/am/modules/incident-sk/incident-sk.scss
+++ b/am/modules/incident-sk/incident-sk.scss
@@ -88,35 +88,6 @@
border: solid var(--on-background) 1px;
}
- .small-icon svg {
- width: 0.9em;
- height: auto;
- padding-right: 0.9em;
- }
-
- .tooltip {
- position: relative;
- display: inline-block;
- }
-
- .tooltip .tooltiptext {
- visibility: hidden;
- white-space: nowrap;
- background-color: var(--minimized);
- color: var(--on-background);
- text-align: center;
- border-radius: 0.5em;
- padding: 0.5em;
-
- /* Position the tooltip */
- position: absolute;
- z-index: 1;
- }
-
- .tooltip:hover .tooltiptext {
- visibility: visible;
- }
-
.meta {
display: flex;
justify-content: flex-end;
@@ -147,9 +118,8 @@
display: block;
}
-
incident-sk[minimized] {
margin: 1em;
background: var(--minimized);
border-radius: 0.5em;
-}
\ No newline at end of file
+}
diff --git a/am/modules/incident-sk/incident-sk.ts b/am/modules/incident-sk/incident-sk.ts
index f94d24e..e2ffeab 100644
--- a/am/modules/incident-sk/incident-sk.ts
+++ b/am/modules/incident-sk/incident-sk.ts
@@ -53,9 +53,9 @@
*/
import { define } from 'elements-sk/define';
import 'elements-sk/icon/alarm-off-icon-sk';
-import 'elements-sk/icon/content-copy-icon-sk';
import 'elements-sk/icon/delete-icon-sk';
import 'elements-sk/icon/thumbs-up-down-icon-sk';
+import '../../../infra-sk/modules/clipboard-sk';
import '../silence-sk';
import { $$ } from 'common-sk/modules/dom';
@@ -206,21 +206,7 @@
private maybeDisplayCopyIcon(k: string): TemplateResult {
if (PARAMS_TO_DISPLAY_COPY_ICON.includes(k)) {
- return html`
- <div class="tooltip">
- <content-copy-icon-sk
- class="small-icon clickable"
- @click=${() => {
- ($$(`#tooltiptext-${k}`) as HTMLElement).textContent = 'Copied!';
- navigator.clipboard.writeText(this.state.params[k]);
- }}
- @mouseleave=${() => {
- ($$(`#tooltiptext-${k}`) as HTMLElement).textContent = 'Copy to Clipboard';
- }}
- ></content-copy-icon-sk>
- <span class="tooltiptext" id="tooltiptext-${k}">Copy to Clipboard</span>
- </div>
- `;
+ return html`<clipboard-sk value=${this.state.params[k]}></clipboard-sk>`;
}
return html``;
}
diff --git a/infra-sk/modules/clipboard-sk/clipboard-sk.ts b/infra-sk/modules/clipboard-sk/clipboard-sk.ts
index 94ecc58..e435f64 100644
--- a/infra-sk/modules/clipboard-sk/clipboard-sk.ts
+++ b/infra-sk/modules/clipboard-sk/clipboard-sk.ts
@@ -47,8 +47,8 @@
private static template = (ele: ClipboardSk) => html`
<content-copy-icon-sk
id=${ele.icon_id}
- @click=${() => ele.copyToClipboard()}>
- @mouseleave=${() => ele.restoreToolTipMessage()}
+ @click=${() => ele.copyToClipboard()}
+ @mouseleave=${() => ele.restoreToolTipMessage()}>
</content-copy-icon-sk>
<tooltip-sk
target=${ele.icon_id}
diff --git a/infra-sk/modules/tooltip-sk/tooltip-sk.scss b/infra-sk/modules/tooltip-sk/tooltip-sk.scss
index 7213602..a249e1d 100644
--- a/infra-sk/modules/tooltip-sk/tooltip-sk.scss
+++ b/infra-sk/modules/tooltip-sk/tooltip-sk.scss
@@ -13,7 +13,6 @@
z-index: 10;
top: -12px;
left: 12px;
- opacity: 0.75;
background-color: var(--surface-2dp);
color: var(--on-surface);
