Upgrade ember-power-calendar, ember-power-select & ember-concurrency

appknox · Sep 10, 2024 · 654a0a7 · 654a0a7
1 parent 1a66538
commit 654a0a7
Show file tree

Hide file tree

Showing 21 changed files with 1,123 additions and 4,247 deletions.
diff --git a/app/components/ak-select/index.hbs b/app/components/ak-select/index.hbs
@@ -38,11 +38,12 @@
           @disabled={{@disabled}}
           @renderInPlace={{@renderInPlace}}
           @ariaInvalid='{{if @error true false}}'
-          @onOpen={{@onOpen}}
+          @onOpen={{this.onOpen}}
           @onClose={{@onClose}}
           @loadingMessage={{@loadingMessage}}
           @selectedItemComponent={{@selectedItemComponent}}
           @verticalPosition={{or @verticalPosition 'below'}}
+          @horizontalPosition={{or @horizontalPosition 'left'}}
           @searchEnabled={{@searchEnabled}}
           @searchPlaceholder={{@searchPlaceholder}}
           @extra={{this.extra}}

diff --git a/app/components/ak-select/index.ts b/app/components/ak-select/index.ts
@@ -1,18 +1,22 @@
-import {
+import { guidFor } from '@ember/object/internals';
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { next } from '@ember/runloop';
+
+import type {
   PowerSelectArgs,
   Select,
 } from 'ember-power-select/components/power-select';
+
 import styles from './index.scss';
-import { guidFor } from '@ember/object/internals';
-import Component from '@glimmer/component';
-import { TypographyColors, TypographyVariant } from '../ak-typography';
+import type { TypographyColors, TypographyVariant } from '../ak-typography';
 
 type AkSelectLabelTypographyVariant = TypographyVariant;
 type AkSelectLabelTypographyColor = TypographyColors;
 
 interface AkSelectNamedArgs<O> extends PowerSelectArgs {
   labelId?: string;
-  required?: boolean;
+  required?: string;
   disabled?: boolean;
   label?: string;
   helperText?: string;
@@ -63,6 +67,14 @@ export default class AkSelectComponent<O> extends Component<
       triggerError: styles['ak-select-trigger-error'],
     };
   }
+
+  @action
+  onOpen(select: Select, event: Event) {
+    // Reposition the dropdown to make sure it's properly aligned
+    next(this, () => select.actions.reposition());
+
+    this.args.onOpen?.(select, event);
+  }
 }
 
 declare module '@glint/environment-ember-loose/registry' {

diff --git a/app/components/security/analysis-details/regulatory-categories/index.hbs b/app/components/security/analysis-details/regulatory-categories/index.hbs
@@ -24,7 +24,7 @@
       </AkTypography>
 
       <AkSelect
-        @placeholder='Select OWASP Categories'
+        @placeholder={{cat.placeholder}}
         @selected={{cat.selected}}
         @options={{cat.options}}
         @onChange={{cat.onChange}}

diff --git a/app/components/security/analysis-details/regulatory-categories/index.ts b/app/components/security/analysis-details/regulatory-categories/index.ts
@@ -175,6 +175,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'owasp',
         title: 'OWASP Category',
+        placeholder: 'Select OWASP Categories',
         labelKeys: ['code', 'year', 'title'],
         selected: this.analysis?.owasp.slice(),
         options: this.owasps,
@@ -184,6 +185,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'owaspmobile2024',
         title: 'OWASP Mobile Top 10 (2024)',
+        placeholder: 'Select OWASP Mobile Top 10 (2024)',
         labelKeys: ['code', 'year', 'title'],
         selected: this.analysis?.owaspmobile2024.slice(),
         options: this.owaspmobile2024s,
@@ -192,6 +194,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'owaspapi2023',
         title: 'OWASP API TOP 10 (2023)',
+        placeholder: 'Select OWASP API TOP 10 (2023)',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.owaspapi2023.slice(),
         options: this.owaspapi2023s,
@@ -200,6 +203,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'pcidss',
         title: 'PCI-DSS Risk Category',
+        placeholder: 'Select PCI-DSS Risk Category',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.pcidss.slice(),
         options: this.pcidsses,
@@ -208,6 +212,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'pcidss4',
         title: 'PCI-DSS Risk Category (v 4.0)',
+        placeholder: 'Select PCI-DSS Risk Category (v 4.0)',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.pcidss4.slice(),
         options: this.pcidss4s,
@@ -217,6 +222,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'hipaa',
         title: 'HIPAA Sections',
+        placeholder: 'Select HIPAA Sections',
         labelKeys: ['code', 'safeguard', 'title'],
         selected: this.analysis?.hipaa.slice(),
         options: this.hipaas,
@@ -225,6 +231,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'masvs',
         title: 'OWASP MASVS (v2) Requirements',
+        placeholder: 'Select OWASP MASVS (v2) Requirements',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.masvs.slice(),
         options: this.masvses,
@@ -233,6 +240,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'mstg',
         title: 'MSTG Requirements',
+        placeholder: 'Select MSTG Requirements',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.mstg.slice(),
         options: this.mstgs,
@@ -241,6 +249,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'asvs',
         title: 'ASVS Requirements',
+        placeholder: 'Select ASVS Requirements',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.asvs.slice(),
         options: this.asvses,
@@ -249,6 +258,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'cwe',
         title: 'CWE Weaknesses',
+        placeholder: 'Select CWE Weaknesses',
         labelKeys: ['code', 'url'],
         selected: this.analysis?.cwe.slice(),
         options: this.cwes,
@@ -257,6 +267,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'gdpr',
         title: 'GDPR Articles',
+        placeholder: 'Select GDPR Articles',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.gdpr.slice(),
         options: this.gdprs,
@@ -265,6 +276,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'nistsp800171',
         title: 'NIST SP 800-171',
+        placeholder: 'Select NIST SP 800-171',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.nistsp800171.slice(),
         options: this.nistsp800171s,
@@ -273,6 +285,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'nistsp80053',
         title: 'NIST SP 800-53',
+        placeholder: 'Select NIST SP 800-53',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.nistsp80053.slice(),
         options: this.nistsp80053s,
@@ -281,6 +294,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
       {
         key: 'sama',
         title: 'Saudi Arabian Monetary Authority',
+        placeholder: 'Select Saudi Arabian Monetary Authority',
         labelKeys: ['code', 'title'],
         selected: this.analysis?.sama.slice(),
         options: this.sama,
@@ -289,6 +303,7 @@ export default class SecurityAnalysisDetailsRegulatoryCategoriesComponent extend
     ] as Array<{
       key: string;
       title: string;
+      placeholder: string;
       labelKeys: string[];
       selected: Array<RegulatoryCategoryModels>;
       options: Array<RegulatoryCategoryModels>;

diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -4,4 +4,6 @@
 
 {{outlet}}
 
+<BasicDropdownWormhole />
+
 <NotificationContainer @position='bottom-right' @zindex='1400' />
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -16,6 +16,9 @@ module.exports = function (defaults) {
     storeConfigInMeta: false,
     babel: {
       sourceMaps: 'inline',
+      plugins: [
+        require.resolve('ember-concurrency/async-arrow-task-transform'),
+      ],
     },
     minifyJS: {
       options: {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,6 @@

		{{outlet}}

		<BasicDropdownWormhole />

		<NotificationContainer @position='bottom-right' @zindex='1400' />