Skip to content

Commit

Permalink
Merge branch 'main' into fix/message-box-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
InnaAtanasova committed Dec 18, 2020
2 parents 45df192 + 6142036 commit fc93cac
Show file tree
Hide file tree
Showing 52 changed files with 1,395 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .ci-env/flags.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# This flag indicates if the tag should be treated as a latest one, which is going to trigger
# - npm publish with `latest` tag, which will become new default version
# - master version incrementation
# - main version incrementation
latest=false
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#### Please check whether the PR fulfills the following requirements

- [ ] the commit message follows the guideline:
https://github.com/SAP/fundamental-ngx/blob/master/CONTRIBUTING.md
https://github.com/SAP/fundamental-ngx/blob/main/CONTRIBUTING.md
- [ ] tests for the changes that have been done
- [ ] all items on the PR Review Checklist are addressed :
https://github.com/SAP/fundamental-ngx/wiki/PR-Review-Checklist
Expand Down
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,24 @@ jobs:
before_script: export NODE_OPTIONS='–--max_old_space_size=4096'
script: bash ./ci-scripts/test-lint.sh && npm run test:coveralls && npm run build-pack-library
- stage: "Pre-release"
if: branch = master AND type = push
if: branch = main AND type = push
before_script: export NODE_OPTIONS='–--max_old_space_size=4096'
before_deploy:
- git checkout master
- git checkout main
- bash ./ci-scripts/setup-npm.sh
deploy:
- provider: script
script: bash ./ci-scripts/publish.sh
skip_cleanup: true
on:
all_branches: true
- stage: "Release"
if: branch = tmp_branch_for_automated_release_do_not_use
before_script: export NODE_OPTIONS='-–-max_old_space_size=4096'
before_deploy:
- git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
- git fetch
- git checkout master
- git checkout main
- bash ./ci-scripts/setup-npm.sh
deploy:
- provider: script
Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,35 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [0.26.0-rc.4](https://github.com/SAP/fundamental-ngx/compare/v0.26.0-rc.3...v0.26.0-rc.4) (2020-12-18)

## [0.26.0-rc.3](https://github.com/SAP/fundamental-ngx/compare/v0.26.0-rc.2...v0.26.0-rc.3) (2020-12-18)


### Features

* (Platform) Introduce Date picker component ([#4109](https://github.com/SAP/fundamental-ngx/issues/4109)) ([4f9eda9](https://github.com/SAP/fundamental-ngx/commit/4f9eda99b6b216ba3014c086582d0479899a4329))

## [0.26.0-rc.2](https://github.com/SAP/fundamental-ngx/compare/v0.26.0-rc.1...v0.26.0-rc.2) (2020-12-18)


### Bug Fixes

* (Core) Carousel direction defects ([#4080](https://github.com/SAP/fundamental-ngx/issues/4080)) ([17ffa12](https://github.com/SAP/fundamental-ngx/commit/17ffa1226bb066fe59cd0ca08021d407f17f4c8e))

## [0.26.0-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.26.0-rc.0...v0.26.0-rc.1) (2020-12-17)

## [0.26.0-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.25.1...v0.26.0-rc.0) (2020-12-17)


### ⚠ BREAKING CHANGES

* removed DIALOG_CONFIG and DIALOG_REF and made DialogConfig and DialogRef classes injectable

### Bug Fixes

* (Core) remove DIALOG_CONFIG and DIALOG_REF and make DialogConfig and DialogRef injectable ([#4108](https://github.com/SAP/fundamental-ngx/issues/4108)) ([356b3bb](https://github.com/SAP/fundamental-ngx/commit/356b3bbc108ac774c089a9b2efd153aa84271cb9))

### [0.25.1](https://github.com/SAP/fundamental-ngx/compare/v0.25.1-rc.0...v0.25.1) (2020-12-17)

### [0.25.1-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.25.0...v0.25.1-rc.0) (2020-12-17)
Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ chore: Updated package.json
Type can have following values: `WIP|feat|chore|test|docs|fix`.

The `WIP` represent work in progress and it will not be merged, so please make sure to use one of
the specific format such as `feat|chore|test|doc|fix` if your PR needs to be merged with master
the specific format such as `feat|chore|test|doc|fix` if your PR needs to be merged with main



Expand Down Expand Up @@ -242,7 +242,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
1. Make your changes in a new git branch:

```shell
git checkout -b my-fix-branch master
git checkout -b my-fix-branch main
```

1. Create your patch, **including appropriate test cases**.
Expand Down Expand Up @@ -278,7 +278,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request):

```shell
git rebase master -i
git rebase main -i
git push -f
```

Expand All @@ -298,10 +298,10 @@ from the main (upstream) repository:
git push origin --delete my-fix-branch
```

* Check out the master branch:
* Check out the main branch:

```shell
git checkout master -f
git checkout main -f
```

* Delete the local branch:
Expand All @@ -310,10 +310,10 @@ from the main (upstream) repository:
git branch -D my-fix-branch
```

* Update your master with the latest upstream version:
* Update your main with the latest upstream version:

```shell
git pull --ff upstream master
git pull --ff upstream main
```

## <a name="ci-pipeline"></a> CI PipeLine
Expand Down
12 changes: 6 additions & 6 deletions PLATFORM_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
[![npm version](https://badge.fury.io/js/%40fundamental-ngx%2Fplatform.svg)](//www.npmjs.com/package/@fundamental-ngx.platform)
[![Minified Size](https://badgen.net/bundlephobia/min/%40fundamental-ngx%2Fplatform)](https://bundlephobia.com/result?p=%40fundamental-ngx%2Fplatform)
[![Minzipped Size](https://badgen.net/bundlephobia/minzip/%40fundamental-ngx%2Fplatform)](https://bundlephobia.com/result?p=%40fundamental-ngx%2Fplatform)
[![Build Status](https://travis-ci.org/SAP/fundamental-ngx.svg?branch=master)](https://travis-ci.org/SAP/fundamental-ngx)
[![Coverage Status](https://coveralls.io/repos/github/SAP/fundamental-ngx/badge.svg?branch=master)](https://coveralls.io/github/SAP/fundamental-ngx?branch=master)
[![Build Status](https://travis-ci.org/SAP/fundamental-ngx.svg?branch=main)](https://travis-ci.org/SAP/fundamental-ngx)
[![Coverage Status](https://coveralls.io/repos/github/SAP/fundamental-ngx/badge.svg?branch=main)](https://coveralls.io/github/SAP/fundamental-ngx?branch=main)
[![Slack](https://img.shields.io/badge/slack-ui--fundamentals-blue.svg?logo=slack)](https://ui-fundamentals.slack.com)

## Description
Expand All @@ -28,7 +28,7 @@ As already mentioned above platform the goal is try to be closer to application
enterprise use.

- Defining component model and how we work with data
- Pre-defined layouts (Dashboard, detail page, master/detail page, Search/result page).
- Pre-defined layouts (Dashboard, detail page, main/detail page, Search/result page).

This `Platform UI library` is not going to be only about UI but it needs to also capture other aspects:

Expand Down Expand Up @@ -208,7 +208,7 @@ The `@fundamental-ngx/platform` library follows [Semantic Versioning](https://se

For models prior to 0.11.1 use `fundamental-ngx`

Merges to the `master` branch will be published as a prerelease. Prereleases will include an **rc** version (_e.g._ `[MAJOR].[MINOR].[PATCH]-rc.[RC]`).
Merges to the `main` branch will be published as a prerelease. Prereleases will include an **rc** version (_e.g._ `[MAJOR].[MINOR].[PATCH]-rc.[RC]`).

## Known Issues

Expand All @@ -220,6 +220,6 @@ If you encounter an issue, you can [create a ticket](https://github.com/SAP/fund

## Contributing

If you want to contribute, please check the [CONTRIBUTING.md](https://github.com/SAP/fundamental-ngx/blob/master/CONTRIBUTING.md) documentation for contribution guidelines. Please follow the [Angular commit message guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit).
If you want to contribute, please check the [CONTRIBUTING.md](https://github.com/SAP/fundamental-ngx/blob/main/CONTRIBUTING.md) documentation for contribution guidelines. Please follow the [Angular commit message guidelines](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit).

Check out the [NEW_COMPONENT.md](https://github.com/SAP/fundamental-ngx/blob/master/NEW_COMPONENT.md) guide on building a new component for the library and creating the necessary documentation for your new component.
Check out the [NEW_COMPONENT.md](https://github.com/SAP/fundamental-ngx/blob/main/NEW_COMPONENT.md) guide on building a new component for the library and creating the necessary documentation for your new component.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ The SAP Fundamental Styles library is a design system and HTML/CSS component lib

This repository contains 2 libraries,

* [@fundamental-ngx/core](https://github.com/SAP/fundamental-ngx/tree/master/libs/core):
* [@fundamental-ngx/core](https://github.com/SAP/fundamental-ngx/tree/main/libs/core):
The Fundamental-ngx core provides base angular implementation of SAP Fundamental styles to offer developers a rich set of components
they can use when building angular applications. Fundamental-ngx core angular components provides the end developer with some degree of flexibility as most of the components allow finer customization directly on the HTML template level.

* [@fundamental-ngx/platform](https://github.com/SAP/fundamental-ngx/tree/master/libs/platform):
* [@fundamental-ngx/platform](https://github.com/SAP/fundamental-ngx/tree/main/libs/platform):
The Fundamental-ngx platform is built on top of the core to both enhance existing functionality with additional features
which are driven by application requirements and to provide higher abstraction for the components by hiding most of the internal implementation details which boosts productivity.

Expand All @@ -49,9 +49,9 @@ If you encounter an issue, you can [create a ticket](https://github.com/SAP/fund

## <a name="5"></a>5. Contributing

If you want to contribute, please check the [CONTRIBUTING.md](https://github.com/SAP/fundamental-ngx/blob/master/CONTRIBUTING.md) documentation for contribution guidelines. Please follow the [Angular commit message guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit).
If you want to contribute, please check the [CONTRIBUTING.md](https://github.com/SAP/fundamental-ngx/blob/main/CONTRIBUTING.md) documentation for contribution guidelines. Please follow the [Angular commit message guidelines](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit).

Check out the [NEW_COMPONENT.md](https://github.com/SAP/fundamental-ngx/blob/master/NEW_COMPONENT.md) guide on building a new component for the library and creating the necessary documentation for your new component.
Check out the [NEW_COMPONENT.md](https://github.com/SAP/fundamental-ngx/blob/main/NEW_COMPONENT.md) guide on building a new component for the library and creating the necessary documentation for your new component.

## Similar Projects
## <a name="7"></a>7. Similar Projects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</fd-docs-section-title>
<description>
Checkbox can be used with Reactive Forms by binding it as standard form control with <code>[formControlName]</code>
input. Example below shows usage of checkbox component with Reactive Form. "Accept all" behaves as master control
input. Example below shows usage of checkbox component with Reactive Form. "Accept all" behaves as main control
representing overall state of agreements controls.
</description>
<component-example>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ const routes: Routes = [
SecondDialogExampleComponent,
DialogStackedExampleComponent
],
providers: [DialogService]
providers: [
DialogService
]
})
export class DialogDocsModule { }
1 change: 1 addition & 0 deletions apps/docs/src/app/platform/api-files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const API_FILES = {
button: ['ButtonComponent'],
checkbox: ['CheckboxComponent'],
checkboxGroup: ['CheckboxGroupComponent'],
datePicker: ['PlatformDatetimePickerComponent'],
datetimePicker: ['PlatformDatetimePickerComponent'],
dynamicPage: [
'DynamicPageComponent',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<fd-docs-section-title id="formDatePicker" componentName="DatePicker">
Simple Date Picker and Range Date Picker in Platform Form.
</fd-docs-section-title>

<description>
Value of date-picker can be initialized by passing data using object property in fdp-form-group.
</description>
<component-example>
<fdp-platform-date-picker-example></fdp-platform-date-picker-example>
</component-example>
<code-example [exampleFiles]="datePickerExample"></code-example>

<separator></separator>
<fd-docs-section-title id="disablecalnder" componentName="DatePicker">
Disable parts of Calender for selection
</fd-docs-section-title>
<description>
Part of Calendar can be disabled. This can be controlled by passing disableFunction for simple
date-picker and passing disableRangeStartFunction and disableRangeEndFunction for range Date Picker.
</description>
<component-example>
<fdp-date-picker-disable-func-example></fdp-date-picker-disable-func-example>
</component-example>
<code-example [exampleFiles]="datePickerDisableFunction"></code-example>

<separator></separator>
<fd-docs-section-title id="datePickerFormat" componentName="DatePicker">
Date Picker Formatting
</fd-docs-section-title>
<description>
Providing a custom format for the dates is possible through providing <code>DATE_TIME_FORMATS</code> config.
</description>
<component-example>
<fdp-date-picker-format-example></fdp-date-picker-format-example>
</component-example>
<code-example [exampleFiles]="datePickerFormat"></code-example>

<separator></separator>

<fd-docs-section-title id="internationalExample" componentName="'DatePickerInternational'">
Internationalization of Date Picker
</fd-docs-section-title>
<description>
It is possible to internationalize both the aria labels and the month names/weekdays through providing a service.
</description>
<component-example>
<fdp-date-picker-i18n-example></fdp-date-picker-i18n-example>
</component-example>
<code-example [exampleFiles]="datePickeri18nExample"></code-example>
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import { Component } from '@angular/core';
import * as datepickerHtml from '!raw-loader!./platform-date-picker-examples/platform-date-picker-example.component.html';
import * as datepickerts from '!raw-loader!./platform-date-picker-examples/platform-date-picker-example.component.ts';
import * as datepickeri18n from '!raw-loader!./platform-date-picker-examples/platform-date-picker-i18n-example.component.ts';
import * as datepickerDisabledFnCodeTs from '!raw-loader!./platform-date-picker-examples/platform-date-picker-disable-func-example.component.ts';
import * as datepickerDisabledFnHtml from '!raw-loader!./platform-date-picker-examples/platform-date-picker-disable-func-example.component.html';
import * as datepickerFormatTs from '!raw-loader!./platform-date-picker-examples/platform-date-picker-format-example.component.ts';
import * as datepickerFormatHtml from '!raw-loader!./platform-date-picker-examples/platform-date-picker-format-example.component.html';

import { ExampleFile } from '../../../../documentation/core-helpers/code-example/example-file';

@Component({
selector: 'app-datepicker',
templateUrl: './platform-date-picker-docs.component.html'
})
export class PlatformDatePickerDocsComponent {
datePickerExample: ExampleFile[] = [
{
language: 'html',
code: datepickerHtml,
fileName: 'platform-date-picker-example'
},
{
language: 'typescript',
code: datepickerts,
fileName: 'platform-date-picker-example',
component: 'PlatformDatePickerExampleComponent'
}
];

datePickeri18nExample: ExampleFile[] = [
{
language: 'typescript',
code: datepickeri18n,
fileName: 'platform-date-picker-i18n-example',
component: 'PlatformDatePickeri18nExampleComponent'
}
];

datePickerDisableFunction: ExampleFile[] = [
{
language: 'html',
code: datepickerDisabledFnHtml,
fileName: 'platform-date-picker-disable-func-example'
},
{
language: 'typescript',
code: datepickerDisabledFnCodeTs,
fileName: 'platform-date-picker-disable-func-example',
component: 'DatePickerDisableFuncExampleComponent'
}
];

datePickerFormat: ExampleFile[] = [
{
language: 'typescript',
code: datepickerFormatTs,
fileName: 'platform-date-picker-format-example',
component: 'PlatformDatePickerFormatExampleComponent'
},
{
language: 'html',
code: datepickerFormatHtml,
fileName: 'platform-date-picker-format-example',
component: 'PlatformDatePickerFormatExampleComponent'
},
];
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { ApiComponent } from '../../../../documentation/core-helpers/api/api.component';
import { API_FILES } from '../../../api-files';
import { SharedDocumentationPageModule } from '../../../../documentation/shared-documentation-page.module';
import { PlatformDatePickerModule, FdpFormGroupModule, PlatformLinkModule } from '@fundamental-ngx/platform';
import { FdDatetimeModule, SegmentedButtonModule } from '@fundamental-ngx/core';

import { PlatformDatePickerDocsComponent } from './platform-date-picker-docs.component';
import { PlatformDatePickerHeaderComponent } from './platform-date-picker-header/platform-date-picker-header.component';
import { PlatformDatePickerExampleComponent } from './platform-date-picker-examples/platform-date-picker-example.component';
import { PlatformDatePickeri18nExampleComponent } from './platform-date-picker-examples/platform-date-picker-i18n-example.component';
import { PlatformDatePickerDisableFuncExampleComponent } from './platform-date-picker-examples/platform-date-picker-disable-func-example.component';
import { PlatformDatePickerFormatExampleComponent } from './platform-date-picker-examples/platform-date-picker-format-example.component';

const routes: Routes = [
{
path: '',
component: PlatformDatePickerHeaderComponent,
children: [
{ path: '', component: PlatformDatePickerDocsComponent },
{ path: 'api', component: ApiComponent, data: { content: API_FILES.datePicker } }
]
}
];

@NgModule({
declarations: [
PlatformDatePickerDocsComponent,
PlatformDatePickerExampleComponent,
PlatformDatePickerDisableFuncExampleComponent,
PlatformDatePickerHeaderComponent,
PlatformDatePickeri18nExampleComponent,
PlatformDatePickerFormatExampleComponent
],
imports: [
RouterModule.forChild(routes),
SharedDocumentationPageModule,
SegmentedButtonModule,
PlatformLinkModule,
FdDatetimeModule,
PlatformDatePickerModule,
FdpFormGroupModule
],
exports: [RouterModule]

})
export class PlatformDatePickerDocsModule {}

0 comments on commit fc93cac

Please sign in to comment.