From 5c1fef81b2a03f6a3b551d8434c253233a79c649 Mon Sep 17 00:00:00 2001 From: AadeshNichite Date: Tue, 10 Sep 2024 17:09:57 +0530 Subject: [PATCH 1/3] Eula popup added Signed-off-by: AadeshNichite --- .../eula-confirm/eula-confirm.dialog.html | 56 ++++++++++++++++++ .../eula-confirm/eula-confirm.dialog.ts | 57 +++++++++++++++++++ .../builder-web/app/shared/shared.module.ts | 5 +- .../sign-in-page/sign-in-page.component.html | 6 +- .../sign-in-page/sign-in-page.component.ts | 54 +++++++++++++++++- 5 files changed, 173 insertions(+), 5 deletions(-) create mode 100644 components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.html create mode 100644 components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.ts diff --git a/components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.html b/components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.html new file mode 100644 index 0000000000..835034e529 --- /dev/null +++ b/components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.html @@ -0,0 +1,56 @@ +
+
+

{{ heading }}

+

X

 +
+
+ +
+ +
+
+

+ {{ body }} +

+
+ +
+
+ +
+
+ + diff --git a/components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.ts b/components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.ts new file mode 100644 index 0000000000..891130a749 --- /dev/null +++ b/components/builder-web/app/shared/dialog/eula-confirm/eula-confirm.dialog.ts @@ -0,0 +1,57 @@ +// Copyright (c) 2016-2017 Chef Software Inc. and/or applicable contributors +// +// Licensed 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 { Component, Inject } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; + +@Component({ + template: require('./eula-confirm.dialog.html'), +}) +export class EulaConfirmDialog { + isButtonDisabled: boolean = true; + checked: boolean = false; + + constructor( + private ref: MatDialogRef, + @Inject(MAT_DIALOG_DATA) private data: any + ) { } + + get heading() { + return this.data.heading || 'Confirm'; + } + + get body() { + return this.data.body || 'Are you sure?'; + } + + get action() { + return this.data.action || 'do it'; + } + + get signupUrl() { + return this.data.signupUrl; + } + + ok() { + this.ref.close(true); + } + + checkbox() { + this.checked === true ? this.isButtonDisabled = false : this.isButtonDisabled = true; + } + + cancel() { + this.ref.close(false); + } +} diff --git a/components/builder-web/app/shared/shared.module.ts b/components/builder-web/app/shared/shared.module.ts index 05d9627210..b333762b3c 100644 --- a/components/builder-web/app/shared/shared.module.ts +++ b/components/builder-web/app/shared/shared.module.ts @@ -45,6 +45,7 @@ import { VisibilitySelectorComponent } from './visibility-selector/visibility-se import { KeysPipe } from './pipes/keys.pipe'; import { SimpleConfirmDialog } from './dialog/simple-confirm/simple-confirm.dialog'; import { PromoteConfirmDialog } from './dialog/promote-confirm/promote-confirm.dialog'; +import { EulaConfirmDialog } from './dialog/eula-confirm/eula-confirm.dialog'; import { BuilderEnabledGuard } from './guards/builder-enabled.guard'; import { VisibilityEnabledGuard } from './guards/visibility-enabled.guard'; import { OriginMemberGuard } from './guards/origin-member.guard'; @@ -91,6 +92,7 @@ import { JobNoticeComponent } from './job-notice/job-notice.component'; VisibilitySelectorComponent, SimpleConfirmDialog, PromoteConfirmDialog, + EulaConfirmDialog, JobNoticeComponent, KeysPipe ], @@ -99,7 +101,8 @@ import { JobNoticeComponent } from './job-notice/job-notice.component'; DockerExportSettingsDialog, JobCancelDialog, SimpleConfirmDialog, - PromoteConfirmDialog + PromoteConfirmDialog, + EulaConfirmDialog ], exports: [ MatMenuModule, diff --git a/components/builder-web/app/sign-in-page/sign-in-page.component.html b/components/builder-web/app/sign-in-page/sign-in-page.component.html index 1075d7c513..8c2de31a47 100644 --- a/components/builder-web/app/sign-in-page/sign-in-page.component.html +++ b/components/builder-web/app/sign-in-page/sign-in-page.component.html @@ -1,11 +1,11 @@ -