From b9de3b4f07157cc117b8e30e7c4dd0c3af26d0d5 Mon Sep 17 00:00:00 2001 From: Sam David Date: Mon, 13 Jan 2025 11:24:44 +0530 Subject: [PATCH] Release prod version: 25.1, version: 17.3.0 --- .../details/skeleton-loader/index.hbs | 88 +++++++++++++++ .../details/skeleton-loader/index.scss | 41 +++++++ .../details/skeleton-loader/index.ts | 9 ++ .../app-monitoring/skeleton-loader/index.hbs | 40 +++++++ .../app-monitoring/skeleton-loader/index.scss | 17 +++ .../app-monitoring/skeleton-loader/index.ts | 9 ++ .../file-compare/skeleton-loader/index.hbs | 63 +++++++++++ .../file-compare/skeleton-loader/index.scss | 18 +++ .../file-compare/skeleton-loader/index.ts | 9 ++ .../settings/skeleton-loader/index.hbs | 103 ++++++++++++++++++ .../settings/skeleton-loader/index.scss | 43 ++++++++ .../settings/skeleton-loader/index.ts | 18 +++ .../index.hbs | 20 +++- .../skeleton-loader/index.hbs | 31 ++++++ .../skeleton-loader/index.scss | 12 ++ .../skeleton-loader/index.ts | 9 ++ .../scan-details/skeleton-loader/index.hbs | 35 ++++++ .../scan-details/skeleton-loader/index.scss | 10 ++ .../scan-details/skeleton-loader/index.ts | 9 ++ app/styles/_component-variables.scss | 42 +++++++ .../app-monitoring/index-loading.hbs | 5 + .../monitoring-details-loading.hbs | 5 + .../dashboard/compare-loading.hbs | 5 + .../compare/untested-cases-loading.hbs | 3 + .../organization-settings/index-loading.hbs | 1 + .../sbom/component-details-loading.hbs | 3 + .../dashboard/sbom/scan-details-loading.hbs | 3 + 27 files changed, 650 insertions(+), 1 deletion(-) create mode 100644 app/components/app-monitoring/details/skeleton-loader/index.hbs create mode 100644 app/components/app-monitoring/details/skeleton-loader/index.scss create mode 100644 app/components/app-monitoring/details/skeleton-loader/index.ts create mode 100644 app/components/app-monitoring/skeleton-loader/index.hbs create mode 100644 app/components/app-monitoring/skeleton-loader/index.scss create mode 100644 app/components/app-monitoring/skeleton-loader/index.ts create mode 100644 app/components/file-compare/skeleton-loader/index.hbs create mode 100644 app/components/file-compare/skeleton-loader/index.scss create mode 100644 app/components/file-compare/skeleton-loader/index.ts create mode 100644 app/components/organization/settings/skeleton-loader/index.hbs create mode 100644 app/components/organization/settings/skeleton-loader/index.scss create mode 100644 app/components/organization/settings/skeleton-loader/index.ts create mode 100644 app/components/sbom/component-details/skeleton-loader/index.hbs create mode 100644 app/components/sbom/component-details/skeleton-loader/index.scss create mode 100644 app/components/sbom/component-details/skeleton-loader/index.ts create mode 100644 app/components/sbom/scan-details/skeleton-loader/index.hbs create mode 100644 app/components/sbom/scan-details/skeleton-loader/index.scss create mode 100644 app/components/sbom/scan-details/skeleton-loader/index.ts create mode 100644 app/templates/authenticated/dashboard/app-monitoring/index-loading.hbs create mode 100644 app/templates/authenticated/dashboard/app-monitoring/monitoring-details-loading.hbs create mode 100644 app/templates/authenticated/dashboard/compare-loading.hbs create mode 100644 app/templates/authenticated/dashboard/compare/untested-cases-loading.hbs create mode 100644 app/templates/authenticated/dashboard/organization-settings/index-loading.hbs create mode 100644 app/templates/authenticated/dashboard/sbom/component-details-loading.hbs create mode 100644 app/templates/authenticated/dashboard/sbom/scan-details-loading.hbs diff --git a/app/components/app-monitoring/details/skeleton-loader/index.hbs b/app/components/app-monitoring/details/skeleton-loader/index.hbs new file mode 100644 index 000000000..2568aac96 --- /dev/null +++ b/app/components/app-monitoring/details/skeleton-loader/index.hbs @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ +
+ + + + + + + + + + + +
+
+
+ + + + + + +
+ + + + \ No newline at end of file diff --git a/app/components/app-monitoring/details/skeleton-loader/index.scss b/app/components/app-monitoring/details/skeleton-loader/index.scss new file mode 100644 index 000000000..3c62707b2 --- /dev/null +++ b/app/components/app-monitoring/details/skeleton-loader/index.scss @@ -0,0 +1,41 @@ +.app-details-container { + padding-bottom: 1.3571em; + + .app-details-wrapper { + padding: 1.5em; + border: 1px solid var(--appmonitoring-details-skeleton-loader-border-color); + margin-bottom: 1.5714em; + + .overview-container { + height: fit-content; + margin-bottom: 1.4286em; + + .overview-icons { + margin-bottom: 0.857em; + } + + .monitoring-toggle-container { + border-left: 1px solid + var(--appmonitoring-details-skeleton-loader-toggle-border-color); + padding-left: 1.214em; + } + } + + .monitoring-details-container { + width: 100%; + + .monitoring-details-group { + width: 100%; + display: grid; + grid-template-columns: repeat(2, 400px); + + &:first-of-type { + border-bottom: 1px solid + var(--appmonitoring-details-skeleton-loader-border-color); + padding-bottom: 0.6428em; + margin-bottom: 0.6428em; + } + } + } + } +} diff --git a/app/components/app-monitoring/details/skeleton-loader/index.ts b/app/components/app-monitoring/details/skeleton-loader/index.ts new file mode 100644 index 000000000..1475e73df --- /dev/null +++ b/app/components/app-monitoring/details/skeleton-loader/index.ts @@ -0,0 +1,9 @@ +import Component from '@glimmer/component'; + +export default class AppMonitoringDetailsSkeletonLoaderComponent extends Component {} + +declare module '@glint/environment-ember-loose/registry' { + export default interface Registry { + 'AppMonitoring::Details::SkeletonLoader': typeof AppMonitoringDetailsSkeletonLoaderComponent; + } +} diff --git a/app/components/app-monitoring/skeleton-loader/index.hbs b/app/components/app-monitoring/skeleton-loader/index.hbs new file mode 100644 index 000000000..16a0eb9f8 --- /dev/null +++ b/app/components/app-monitoring/skeleton-loader/index.hbs @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
\ No newline at end of file diff --git a/app/components/app-monitoring/skeleton-loader/index.scss b/app/components/app-monitoring/skeleton-loader/index.scss new file mode 100644 index 000000000..99f928772 --- /dev/null +++ b/app/components/app-monitoring/skeleton-loader/index.scss @@ -0,0 +1,17 @@ +.header-app-moitoring-page { + border: 1px solid var(--appmonitoring-skeleton-loader-header-border-color); + border-radius: var(--appmonitoring-skeleton-loader-header-border-radius); + padding-top: 0.714em; + + .header-app-moitoring-page-title { + padding: 1em 1.285em; + } +} + +.header-app-moitoring-page-sorting-filter { + padding: 0.785em 1.285em; +} + +.app-monitoring-table-container { + margin-top: 1.25em; +} diff --git a/app/components/app-monitoring/skeleton-loader/index.ts b/app/components/app-monitoring/skeleton-loader/index.ts new file mode 100644 index 000000000..dbfa0a1b6 --- /dev/null +++ b/app/components/app-monitoring/skeleton-loader/index.ts @@ -0,0 +1,9 @@ +import Component from '@glimmer/component'; + +export default class AppMonitoringSkeletonLoaderComponent extends Component {} + +declare module '@glint/environment-ember-loose/registry' { + export default interface Registry { + 'AppMonitoring::SkeletonLoader': typeof AppMonitoringSkeletonLoaderComponent; + } +} diff --git a/app/components/file-compare/skeleton-loader/index.hbs b/app/components/file-compare/skeleton-loader/index.hbs new file mode 100644 index 000000000..27a0f06f9 --- /dev/null +++ b/app/components/file-compare/skeleton-loader/index.hbs @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/app/components/file-compare/skeleton-loader/index.scss b/app/components/file-compare/skeleton-loader/index.scss new file mode 100644 index 000000000..1c54d29b4 --- /dev/null +++ b/app/components/file-compare/skeleton-loader/index.scss @@ -0,0 +1,18 @@ +.file-compare-header-project-overview { + background-color: var(--file-compare-skeleton-loader-background-color); + border: 1px solid var(--file-compare-skeleton-loader-border-color); + padding: 1em 1.5em; +} + +.file-compare-header-info { + padding: 1.4286em; + border: 1px solid var(--file-compare-skeleton-loader-border-color); + border-top: none; + box-shadow: var(--file-compare-skeleton-loader-box-shadow); + background-color: var(--file-compare-skeleton-loader-background-color); +} + +.file-compare-tabs { + margin-top: 1.4286em; + background: var(--file-compare-skeleton-loader-background-color); +} diff --git a/app/components/file-compare/skeleton-loader/index.ts b/app/components/file-compare/skeleton-loader/index.ts new file mode 100644 index 000000000..e4cc2300b --- /dev/null +++ b/app/components/file-compare/skeleton-loader/index.ts @@ -0,0 +1,9 @@ +import Component from '@glimmer/component'; + +export default class FileCompareSkeletonLoaderComponent extends Component {} + +declare module '@glint/environment-ember-loose/registry' { + export default interface Registry { + 'FileCompare::SkeletonLoader': typeof FileCompareSkeletonLoaderComponent; + } +} diff --git a/app/components/organization/settings/skeleton-loader/index.hbs b/app/components/organization/settings/skeleton-loader/index.hbs new file mode 100644 index 000000000..db59b5214 --- /dev/null +++ b/app/components/organization/settings/skeleton-loader/index.hbs @@ -0,0 +1,103 @@ +
+ {{#if this.me.org.is_admin}} + + + + + + + + +
+ {{#each (array 0 1 2 3 4)}} + + + + + + {{/each}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + {{/if}} + + + + + + + + + + + + + +
+
+
+ + + + + +
+ + + +
+ + + + + +
+ +
+
+ {{#each (array 0 1 2)}} + +
+ +
+ +
+ +
+
+ {{/each}} +
+
+
+
+ + +
\ No newline at end of file diff --git a/app/components/organization/settings/skeleton-loader/index.scss b/app/components/organization/settings/skeleton-loader/index.scss new file mode 100644 index 000000000..b4dc8b03f --- /dev/null +++ b/app/components/organization/settings/skeleton-loader/index.scss @@ -0,0 +1,43 @@ +.org-settings-container { + background-color: var( + --organization-settings-skeleton-loader-background-color + ); + margin-top: 1.5em; + padding: 1.5em 2em 5em 2em; + box-sizing: border-box; +} + +.bordered-box { + border: 1px solid + var(--organization-settings-skeleton-loader-sso-border-color); + border-radius: var(--organization-settings-skeleton-loader-sso-border-radius); + box-sizing: border-box; + + .bordered-box-section { + padding: 1em; + box-sizing: border-box; + + &:not(:last-child) { + border-bottom: 1px solid + var(--organization-settings-skeleton-loader-sso-border-color); + } + } + + .full-bordered-box-section { + box-sizing: border-box; + + &:not(:last-child) { + border-bottom: 1px solid + var(--organization-settings-skeleton-loader-sso-border-color); + } + + .full-bordered-box-section-column { + padding: 1em; + + &:last-child { + border-left: 1px solid + var(--organization-settings-skeleton-loader-sso-border-color); + } + } + } +} diff --git a/app/components/organization/settings/skeleton-loader/index.ts b/app/components/organization/settings/skeleton-loader/index.ts new file mode 100644 index 000000000..63c4b66f2 --- /dev/null +++ b/app/components/organization/settings/skeleton-loader/index.ts @@ -0,0 +1,18 @@ +import Component from '@glimmer/component'; +import { service } from '@ember/service'; + +import type MeService from 'irene/services/me'; + +export default class OrganizationSettingsSkeletonLoaderComponent extends Component { + @service declare me: MeService; + + get isOwnerOrAdmin() { + return this.me.org?.get('is_owner') || this.me.org?.get('is_admin'); + } +} + +declare module '@glint/environment-ember-loose/registry' { + export default interface Registry { + 'Organization::Settings::SkeletonLoader': typeof OrganizationSettingsSkeletonLoaderComponent; + } +} diff --git a/app/components/regulatory-preference-organization/index.hbs b/app/components/regulatory-preference-organization/index.hbs index c3a4702bd..52b8b5766 100644 --- a/app/components/regulatory-preference-organization/index.hbs +++ b/app/components/regulatory-preference-organization/index.hbs @@ -1,4 +1,22 @@ -{{#if this.orgPreference.reportPreference}} +{{#if this.fetchOrganizationPreference.isRunning}} + + + + + + + + +
+ {{#each (array 0 1 2 3 4)}} + + + + + + {{/each}} +
+{{else if this.orgPreference.reportPreference}}
+ + + + + + + +
+ + + + + + + + + +
+ + \ No newline at end of file diff --git a/app/components/sbom/component-details/skeleton-loader/index.scss b/app/components/sbom/component-details/skeleton-loader/index.scss new file mode 100644 index 000000000..a3b26ba76 --- /dev/null +++ b/app/components/sbom/component-details/skeleton-loader/index.scss @@ -0,0 +1,12 @@ +.summary-header-root { + border-radius: var( + --sbom-component-details-skeleton-loader-summary-border-radius + ); + border: 1px solid + var(--sbom-component-details-skeleton-loader-summary-border-color); + box-sizing: border-box; + + .summary-header-container { + padding: 1.25em 1em; + } +} diff --git a/app/components/sbom/component-details/skeleton-loader/index.ts b/app/components/sbom/component-details/skeleton-loader/index.ts new file mode 100644 index 000000000..e883d1201 --- /dev/null +++ b/app/components/sbom/component-details/skeleton-loader/index.ts @@ -0,0 +1,9 @@ +import Component from '@glimmer/component'; + +export default class SbomComponentDetailsSkeletonLoaderComponent extends Component {} + +declare module '@glint/environment-ember-loose/registry' { + export default interface Registry { + 'Sbom::ComponentDetails::SkeletonLoader': typeof SbomComponentDetailsSkeletonLoaderComponent; + } +} diff --git a/app/components/sbom/scan-details/skeleton-loader/index.hbs b/app/components/sbom/scan-details/skeleton-loader/index.hbs new file mode 100644 index 000000000..4a2922a66 --- /dev/null +++ b/app/components/sbom/scan-details/skeleton-loader/index.hbs @@ -0,0 +1,35 @@ + + + + + + + + +
+ + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/app/components/sbom/scan-details/skeleton-loader/index.scss b/app/components/sbom/scan-details/skeleton-loader/index.scss new file mode 100644 index 000000000..3bf721a02 --- /dev/null +++ b/app/components/sbom/scan-details/skeleton-loader/index.scss @@ -0,0 +1,10 @@ +.summary-header-root { + border-radius: var(--sbom-scan-details-skeleton-loader-summary-border-radius); + border: 1px solid + var(--sbom-scan-details-skeleton-loader-summary-border-color); + box-sizing: border-box; + + .summary-header-container { + padding: 0.75em 1em; + } +} diff --git a/app/components/sbom/scan-details/skeleton-loader/index.ts b/app/components/sbom/scan-details/skeleton-loader/index.ts new file mode 100644 index 000000000..1e263a59d --- /dev/null +++ b/app/components/sbom/scan-details/skeleton-loader/index.ts @@ -0,0 +1,9 @@ +import Component from '@glimmer/component'; + +export default class SbomScanDetailsSkeletonLoaderComponent extends Component {} + +declare module '@glint/environment-ember-loose/registry' { + export default interface Registry { + 'Sbom::ScanDetails::SkeletonLoader': typeof SbomScanDetailsSkeletonLoaderComponent; + } +} diff --git a/app/styles/_component-variables.scss b/app/styles/_component-variables.scss index 06f06832f..fa5922ef5 100644 --- a/app/styles/_component-variables.scss +++ b/app/styles/_component-variables.scss @@ -704,10 +704,20 @@ body { --appmonitoring-border-radius: var(--border-radius); --appmonitoring-border-color: var(--neutral-white-100); + //variables for appmonitoring/skeleton-loader + --appmonitoring-skeleton-loader-header-border-color: var(--neutral-white-100); + --appmonitoring-skeleton-loader-header-border-radius: var(--border-radius); + //variables for appmonitoring/details --appmonitoring-details-border-color: var(--neutral-grey-100); --appmonitoring-details-toggle-border-color: var(--neutral-grey-200); + //variables for appmonitoring/details/skeleton-loader + --appmonitoring-details-skeleton-loader-border-color: var(--neutral-grey-100); + --appmonitoring-details-skeleton-loader-toggle-border-color: var( + --neutral-grey-200 + ); + //variables for appmonitoring/settings --appmonitoring-settings-block-description-text-color: var( --neutral-grey-500 @@ -785,6 +795,14 @@ body { --sbom-scan-details-link-border-radius: var(--border-radius); --sbom-scan-details-link-border-color: var(--border-color-1); + // variables for sbom/scan-details/skeleton-loader + --sbom-scan-details-skeleton-loader-summary-border-radius: var( + --border-radius + ); + --sbom-scan-details-skeleton-loader-summary-border-color: var( + --border-color-1 + ); + // variables for sbom/component-details/vulnerabilities --sbom-component-details-vulnerabilities-list-header-background-color: var( --ak-table-header-background-neutral @@ -828,6 +846,14 @@ body { --common-white ); + // variables for sbom/component-details/skeleton-loader + --sbom-component-details-skeleton-loader-summary-border-radius: var( + --border-radius + ); + --sbom-component-details-skeleton-loader-summary-border-color: var( + --border-color-1 + ); + // variables for sbom/summary-header --sbom-summary-header-border-radius: var(--border-radius); --sbom-summary-header-border-color: var(--border-color-1); @@ -1290,6 +1316,11 @@ body { --file-compare-header-platform-android-color: var(--android); --file-compare-header-platform-ios-color: var(--ios); + // variables for file-compare/skeleton-loader + --file-compare-skeleton-loader-background-color: var(--common-white); + --file-compare-skeleton-loader-border-color: var(--neutral-grey-300); + --file-compare-skeleton-loader-box-shadow: var(--box-shadow-6); + // variables for file-compare/vulnerability-details --file-compare-vulnerability-details-white-background: var(--common-white); --file-compare-vulnerability-details-border-color: var(--neutral-grey-200); @@ -1915,6 +1946,17 @@ body { // variables for organization/settings --organization-settings-container-background-color: var(--background-main); + // variables for organization/settings/skeleton-loader + --organization-settings-skeleton-loader-background-color: var( + --background-main + ); + --organization-settings-skeleton-loader-sso-border-color: var( + --border-color-1 + ); + --organization-settings-skeleton-loader-sso-border-radius: var( + --border-radius + ); + // variables for organization/settings-wrapper --organization-settings-wrapper-background-color: var(--background-light); diff --git a/app/templates/authenticated/dashboard/app-monitoring/index-loading.hbs b/app/templates/authenticated/dashboard/app-monitoring/index-loading.hbs new file mode 100644 index 000000000..88345ade7 --- /dev/null +++ b/app/templates/authenticated/dashboard/app-monitoring/index-loading.hbs @@ -0,0 +1,5 @@ +{{page-title 'Store Monitoring'}} + + + + \ No newline at end of file diff --git a/app/templates/authenticated/dashboard/app-monitoring/monitoring-details-loading.hbs b/app/templates/authenticated/dashboard/app-monitoring/monitoring-details-loading.hbs new file mode 100644 index 000000000..6544a23aa --- /dev/null +++ b/app/templates/authenticated/dashboard/app-monitoring/monitoring-details-loading.hbs @@ -0,0 +1,5 @@ +{{page-title 'Monitoring Details'}} + + + + \ No newline at end of file diff --git a/app/templates/authenticated/dashboard/compare-loading.hbs b/app/templates/authenticated/dashboard/compare-loading.hbs new file mode 100644 index 000000000..776c76e1e --- /dev/null +++ b/app/templates/authenticated/dashboard/compare-loading.hbs @@ -0,0 +1,5 @@ +{{page-title 'File Compare'}} + + + + \ No newline at end of file diff --git a/app/templates/authenticated/dashboard/compare/untested-cases-loading.hbs b/app/templates/authenticated/dashboard/compare/untested-cases-loading.hbs new file mode 100644 index 000000000..48be1eccf --- /dev/null +++ b/app/templates/authenticated/dashboard/compare/untested-cases-loading.hbs @@ -0,0 +1,3 @@ +{{page-title 'Untested'}} + + \ No newline at end of file diff --git a/app/templates/authenticated/dashboard/organization-settings/index-loading.hbs b/app/templates/authenticated/dashboard/organization-settings/index-loading.hbs new file mode 100644 index 000000000..0cba4f507 --- /dev/null +++ b/app/templates/authenticated/dashboard/organization-settings/index-loading.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/authenticated/dashboard/sbom/component-details-loading.hbs b/app/templates/authenticated/dashboard/sbom/component-details-loading.hbs new file mode 100644 index 000000000..da9c43432 --- /dev/null +++ b/app/templates/authenticated/dashboard/sbom/component-details-loading.hbs @@ -0,0 +1,3 @@ +{{page-title 'Component Details'}} + + \ No newline at end of file diff --git a/app/templates/authenticated/dashboard/sbom/scan-details-loading.hbs b/app/templates/authenticated/dashboard/sbom/scan-details-loading.hbs new file mode 100644 index 000000000..8a3841999 --- /dev/null +++ b/app/templates/authenticated/dashboard/sbom/scan-details-loading.hbs @@ -0,0 +1,3 @@ +{{page-title 'Scan Details'}} + + \ No newline at end of file