Skip to content

Commit

Permalink
Merge pull request #1359 from GSA/ng16-sb
Browse files Browse the repository at this point in the history
Angular 16 upgrade and story book updagrade
  • Loading branch information
yerramshilpa authored Dec 14, 2023
2 parents 6aa998b + 2497d78 commit 0fc9f0b
Show file tree
Hide file tree
Showing 294 changed files with 16,751 additions and 22,641 deletions.
15 changes: 12 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,23 @@
#
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
#
version: 2
version: 2.1
orbs:
browser-tools: circleci/[email protected]
jobs:
build:
working_directory: ~/project/sam-design-system
docker:
- image: circleci/node:16.13-browsers
- image: cimg/node:20.8.0-browsers
steps:
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- checkout
- run:
command: |
google-chrome --version
chromedriver --version
name: Check install
- run: npm install
- run: npm run test:prettier
- run: npm run test:components
Expand All @@ -18,4 +27,4 @@ jobs:
- run: npm run publish:libs -- --dry-run
- store_artifacts:
path: coverage
destination: code-coverage
destination: code-coverage
28 changes: 28 additions & 0 deletions .storybook/main.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module.exports = {
stories: [
'../libs/documentation/**/*.stories.ts',
],

addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',

],

staticDirs: [
'../node_modules/accessible-html5-video-player/js',
{ from: '../apps/sam-design-system-site/src/assets/', to: 'assets' },
{ from: '../node_modules/@uswds/uswds/dist/fonts/', to: '/assets/uswds/fonts/'},
{ from: '../node_modules/@uswds/uswds/dist/img/', to: '/assets/uswds/img/'},
{ from: '../node_modules/@gsa-sam/sam-styles/sam-styles/packages/images/', to: '/assets/uswds/img/'},
],

framework: {
name: '@storybook/angular',
options: {}
},

docs: {
autodocs: false
}
};
16 changes: 0 additions & 16 deletions .storybook/main.js

This file was deleted.

7 changes: 7 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@
"maximumError": "6mb"
}
]
},
"development": {
"optimization": false,
"sourceMap": true
}
},
"defaultConfiguration": ""
Expand All @@ -182,6 +186,9 @@
"configurations": {
"production": {
"browserTarget": "sam-design-system-site:build:production"
},
"development": {
"browserTarget": "sam-design-system-site:build:development"
}
}
},
Expand Down
7,888 changes: 4,319 additions & 3,569 deletions documentation.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions libs/documentation/src/lib/apidoc/formly/documentation.json

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions libs/documentation/src/lib/apidoc/formly/formly.ts

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export class AccordionWrapperBasic {
wrappers: ['accordionwrapper'],
key: 'Input',
type: 'input',
templateOptions: {
defaultValue: null,
props: {
label: 'Input',
placeholder: 'eg: Acme Corporation',
description: 'Description',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export class ActionsMenuActionMode {
{
key: 'mode',
type: 'select',
templateOptions: {
defaultValue: null,
props: {
label: 'Choose Action menu mode ',
options: [
{ label: 'Hide', value: ActionMenuMode.HIDDEN },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ export class DescriptionWrapperBasic {
{
wrappers: ['description'],
key: 'Description',
defaultValue: null,
type: 'input',
templateOptions: {
props: {
description: 'Input description',
placeholder: 'eg: Acme Corporation',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ export class DescriptionWrapperCustomText {
{
wrappers: ['description'],
key: 'Description',
defaultValue: null,
type: 'input',
templateOptions: {
props: {
description:
'Please describe your specific situation. <ul><li>my current registration</li><li>My legal business name has been changed</li></ul>',
placeholder: 'eg: Acme Corporation',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ export class DialogAlert {
fields: FormlyFieldConfig[] = [
{
key: 'alert',
templateOptions: {
props: {
label: 'Alert',
},

fieldGroup: [
{
key: 'title',
type: 'input',
templateOptions: {
props: {
label: 'Title',
hideOptional: true,
placeholder: 'type title here',
Expand All @@ -61,7 +61,7 @@ export class DialogAlert {
{
key: 'message',
type: 'input',
templateOptions: {
props: {
label: 'Message',
hideOptional: true,
placeholder: 'type message',
Expand All @@ -71,7 +71,7 @@ export class DialogAlert {
{
key: 'type',
type: 'select',
templateOptions: {
props: {
label: 'Alert Type',
description: 'Select the entity type.',
required: true,
Expand All @@ -86,7 +86,7 @@ export class DialogAlert {
{
key: 'size',
type: 'select',
templateOptions: {
props: {
label: 'Alert modal size',
description: 'Select the entity type.',
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class DownloadComponent {
{
key: 'download',
type: 'radio',
templateOptions: {
props: {
hideOptional: true,
options: [
{
Expand All @@ -37,7 +37,7 @@ export class DownloadComponent {
key: 'mode',
type: 'radio',

templateOptions: {
props: {
hideOptional: true,
class: 'margin-left-2',
options: [
Expand All @@ -54,7 +54,7 @@ export class DownloadComponent {
{
key: 'fileType',
type: 'fileinfo',
templateOptions: {
props: {
label: 'Select file type',
hideOptional: true,
options: [
Expand All @@ -68,15 +68,15 @@ export class DownloadComponent {
{
key: 'fileName',
type: 'input',
templateOptions: {
props: {
label: 'Name',
required: true,
},
},
{
key: 'additionalOptions',
type: 'multicheckbox',
templateOptions: {
props: {
options: [
{
value: 'Add to my saved search',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ export class FormlyCurvyDialog {
{
key: 'filters',

templateOptions: { label: 'Keyword' },
props: { label: 'Keyword' },
fieldGroup: [
{
key: 'scheduleNotifications',
type: 'autocomplete',
templateOptions: {
props: {
label: 'Select how often you would like to receive notifications.',
description: '<a href="#" class="usa-link">When do my saved searches run?</a>',
service: this.service,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class FormlyDialog {
{
key: 'entity.name',
type: 'input',
templateOptions: {
props: {
label: 'Entity Name',
placeholder: 'eg: Acme Corporation',
description: 'Enter the name of your entity.',
Expand All @@ -34,33 +34,33 @@ export class FormlyDialog {
{
key: 'entity.samuei',
type: 'input',
templateOptions: {
props: {
label: 'Unique Entity ID',
},
},
{
key: 'entity.dunuei',
type: 'input',
templateOptions: {
props: {
label: 'Unique Entity ID',
},
},
{
key: 'entity.cage',
type: 'input',
templateOptions: {
props: {
label: 'CAGE / NCAGE',
},
},
{
key: 'filters',

templateOptions: { label: 'Keyword' },
props: { label: 'Keyword' },
fieldGroup: [
{
key: 'firstName',
type: 'autocomplete',
templateOptions: {
props: {
label: 'Auto Complete',
hideLabel: true,
service: this.service,
Expand All @@ -74,15 +74,15 @@ export class FormlyDialog {
{
key: 'entity.naics',
type: 'input',
templateOptions: {
props: {
label: 'NAICS Code',
},
},

{
key: 'entity.psc',
type: 'input',
templateOptions: {
props: {
label: 'Product Service Code',
placeholder: 'eg: Acme Corporation',
description: 'Enter the name of your entity.',
Expand Down
Loading

0 comments on commit 0fc9f0b

Please sign in to comment.