Merge branch 'main' into pr/fix/schematics-fixes-and-theming-support

Author: g-cheishvili

.github/actions/get-version/action.yml

@@ -0,0 +1,12 @@
+name: Get version
+description: Get version from package.json and check if pre-release
+
+outputs:
+    pre-release:
+        description: Is prerelease version
+    version:
+        description: Current version
+
+runs:
+    using: node16
+    main: ./index.js

.github/actions/get-version/index.js

@@ -0,0 +1,20 @@
+const semver = require('semver');
+const fs = require('fs');
+const core = require('@actions/core');
+const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+const currentVersion = packageJson.version;
+
+const run = async () => {
+    const prerelease = !!semver.prerelease(currentVersion, undefined);
+
+    if (prerelease) {
+        core.info(`Current version is a prerelease, skipping...`);
+    } else {
+        core.info(`Current version is a stable release, continuing...`);
+    }
+
+    core.setOutput('pre-release', prerelease);
+    core.setOutput('version', currentVersion);
+};
+
+run();

.github/actions/wait-for-netlify/action.yml

@@ -0,0 +1,24 @@
+# Fork of https://github.com/probablyup/wait-for-netlify-action
+name: 'Wait for Netlify Deployment'
+description: 'Waits for the current GitHub commit Netlify deploy to be ready. Useful in combination with tools like Lighthouse or Cypress.'
+
+inputs:
+    site_id:
+        description: 'The Netlify site ID to test against, get this from the Netlify UI under site settings.'
+        required: true
+    max_timeout:
+        description: 'The max time to wait after the deployment is ready for a valid HTTP status code.'
+        required: false
+    commit_sha:
+        description: 'The commit SHA to wait for.'
+        required: true
+
+outputs:
+    deploy_id:
+        description: 'The Netlify deployment ID'
+    url:
+        description: 'The fully qualified deployment URL'
+
+runs:
+    using: node16
+    main: ./index.js

.github/actions/wait-for-netlify/index.js

@@ -0,0 +1,137 @@
+const core = require('@actions/core');
+const axios = require('axios');
+
+const READY_STATES = ['ready', 'current'];
+
+function getNetlifyUrl(url) {
+    return axios.get(url, {
+        headers: {
+            Authorization: `Bearer ${process.env.NETLIFY_TOKEN}`
+        }
+    });
+}
+
+const waitForDeployCreation = (url, commitSha, MAX_TIMEOUT) => {
+    const increment = 15;
+
+    return new Promise((resolve, reject) => {
+        let elapsedTimeSeconds = 0;
+
+        const handle = setInterval(async () => {
+            elapsedTimeSeconds += increment;
+
+            if (elapsedTimeSeconds >= MAX_TIMEOUT) {
+                clearInterval(handle);
+                return reject(`Timeout reached: Deployment was not created within ${MAX_TIMEOUT} seconds.`);
+            }
+
+            const { data: netlifyDeployments } = await getNetlifyUrl(url);
+
+            if (!netlifyDeployments) {
+                return reject(`Failed to get deployments for site`);
+            }
+
+            const commitDeployment = netlifyDeployments.find((d) => d.commit_ref === commitSha);
+
+            if (commitDeployment) {
+                clearInterval(handle);
+                return resolve(commitDeployment);
+            }
+
+            console.log(`Not yet created, waiting ${increment} more seconds...`);
+        }, increment * 1000);
+    });
+};
+
+const waitForReadiness = (url, MAX_TIMEOUT) => {
+    const increment = 30;
+
+    return new Promise((resolve, reject) => {
+        let elapsedTimeSeconds = 0;
+        let state;
+
+        const handle = setInterval(async () => {
+            elapsedTimeSeconds += increment;
+
+            if (elapsedTimeSeconds >= MAX_TIMEOUT) {
+                clearInterval(handle);
+                return reject(
+                    `Timeout reached: Deployment was not ready within ${MAX_TIMEOUT} seconds. Last known deployment state: ${state}.`
+                );
+            }
+
+            const { data: deploy } = await getNetlifyUrl(url);
+
+            state = deploy.state;
+
+            if (READY_STATES.includes(state)) {
+                clearInterval(handle);
+                return resolve();
+            }
+
+            console.log(`Not yet ready, waiting ${increment} more seconds...`);
+        }, increment * 1000);
+    });
+};
+
+const waitForUrl = async (url, MAX_TIMEOUT) => {
+    const iterations = MAX_TIMEOUT / 3;
+    for (let i = 0; i < iterations; i++) {
+        try {
+            await axios.get(url);
+            return;
+        } catch (e) {
+            console.log(`URL ${url} unavailable, retrying...`);
+            await new Promise((r) => setTimeout(r, 3000));
+        }
+    }
+    core.setFailed(`Timeout reached: Unable to connect to ${url}`);
+};
+
+const run = async () => {
+    try {
+        const netlifyToken = process.env.NETLIFY_TOKEN;
+        const commitSha = core.getInput('commit_sha');
+        const MAX_CREATE_TIMEOUT = 60 * 5; // 5 min
+        const MAX_WAIT_TIMEOUT = 60 * 15; // 15 min
+        const MAX_READY_TIMEOUT = Number(core.getInput('max_timeout')) || 60;
+        const siteId = core.getInput('site_id');
+
+        if (!netlifyToken) {
+            core.setFailed('Please set NETLIFY_TOKEN env variable to your Netlify Personal Access Token secret');
+        }
+        if (!commitSha) {
+            core.setFailed('Could not determine GitHub commit');
+        }
+        if (!siteId) {
+            core.setFailed('Required field `site_id` was not provided');
+        }
+
+        console.log(`Waiting for Netlify to create a deployment for git SHA ${commitSha}`);
+        const commitDeployment = await waitForDeployCreation(
+            `https://api.netlify.com/api/v1/sites/${siteId}/deploys`,
+            commitSha,
+            MAX_CREATE_TIMEOUT
+        );
+
+        const url = `https://${commitDeployment.id}--${commitDeployment.name}.netlify.app`;
+
+        core.setOutput('deploy_id', commitDeployment.id);
+        core.setOutput('url', url);
+
+        console.log(
+            `Waiting for Netlify deployment ${commitDeployment.id} in site ${commitDeployment.name} to be ready`
+        );
+        await waitForReadiness(
+            `https://api.netlify.com/api/v1/sites/${siteId}/deploys/${commitDeployment.id}`,
+            MAX_WAIT_TIMEOUT
+        );
+
+        console.log(`Waiting for a 200 from: ${url}`);
+        await waitForUrl(url, MAX_READY_TIMEOUT);
+    } catch (error) {
+        core.setFailed(typeof error === 'string' ? error : error.message);
+    }
+};
+
+run();

.github/workflows/update-versions.yml

@@ -7,11 +7,13 @@ on:
             - completed
 
 jobs:
-    check-version-type:
+    prepare:
         runs-on: ubuntu-latest
         if: github.event.workflow_run.conclusion == 'success'
         outputs:
-            pre-release: ${{ steps.check-pre-release.outputs.pre-release }}
+            pre-release: ${{ steps.get-version.outputs.pre-release }}
+            version: ${{ steps.get-version.outputs.version }}
+            commit-sha: ${{ steps.get-last-commit.outputs.commit-sha }}
         steps:
             - name: Fetch from origin repo
               uses: actions/checkout@v3
@@ -23,21 +25,18 @@ jobs:
             - name: Setup Node.js and Cache
               uses: ./.github/actions/nodejs
 
-            - name: Check if pre release
-              id: check-pre-release
-              run: |
-                  PRE_RELEASE=$(echo "${{ github.event.workflow_run.head_commit.message }}" | grep -e "-rc." -c) || :
-                  if [ $PRE_RELEASE -eq 0 ]; then
-                    echo "Not a pre-release, continuing..."
-                  else
-                    echo "Pre-release detected, skipping..."
-                  fi
-                  echo "::set-output name=pre-release::$PRE_RELEASE"
+            - name: Check if pre release & get version
+              id: get-version
+              uses: ./.github/actions/get-version
+
+            - name: Get last commit SHA
+              id: get-last-commit
+              run: echo "::set-output name=commit-sha::$(git rev-parse HEAD)"
 
-    update_versions:
+    update-versions:
         runs-on: ubuntu-latest
-        needs: check-version-type
-        if: needs.check-version-type.outputs.pre-release == 0
+        needs: prepare
+        if: needs.prepare.outputs.pre-release == 'false'
         steps:
             - name: Fetch from origin repo
               uses: actions/checkout@v3
@@ -51,9 +50,10 @@ jobs:
 
             - name: Wait for Netlify Deployment
               id: wait-for-deployment
-              uses: probablyup/wait-for-netlify[email protected]
+              uses: ./.github/actions/wait-for-netlify
               with:
                   site_id: ${{ secrets.NETLIFY_SITE_ID }}
+                  commit_sha: ${{ needs.prepare.outputs.commit-sha }}
               env:
                   NETLIFY_TOKEN: ${{ secrets.NETLIFY_TOKEN }}
 
@@ -62,9 +62,14 @@ jobs:
               with:
                   url: ${{ steps.wait-for-deployment.outputs.url }}
 
+            - uses: ./.github/actions/set-up-git
+              name: Set up git user
+              with:
+                  name: ${{ secrets.GH_NAME }}
+                  email: ${{ secrets.GH_EMAIL }}
+
             - name: Commit Changes
               run: |
-                  VERSION=$(echo "${{ github.event.workflow_run.head_commit.message }}" | grep -E "v[0-9]+[^ ]+" -o)
                   git add .
-                  git commit -m "chore(release): add $VERSION to versions.json [ci skip]" --no-verify
+                  git commit -m "chore(release): add v${{ needs.prepare.outputs.version }} to versions.json [ci skip]" --no-verify
                   git push

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [0.36.3-rc.23](https://github.com/SAP/fundamental-ngx/compare/v0.36.3-rc.22...v0.36.3-rc.23) (2022-11-04)
+
+
+### Bug Fixes
+
+* **fn:** show selected option label in select ([#8828](https://github.com/SAP/fundamental-ngx/issues/8828)) ([1a1ea1a](https://github.com/SAP/fundamental-ngx/commit/1a1ea1a0c1e81d1b652e22b6036d895d368e5ae8))
+
+
+
+## [0.36.3-rc.22](https://github.com/SAP/fundamental-ngx/compare/v0.36.3-rc.21...v0.36.3-rc.22) (2022-11-04)
+
+
+### Bug Fixes
+
+* **docs:** update versions workflow ([#8825](https://github.com/SAP/fundamental-ngx/issues/8825)) ([c381d58](https://github.com/SAP/fundamental-ngx/commit/c381d58f4c9196b249332c66355fd70ab41001a3))
+
+
+
 ## [0.36.3-rc.21](https://github.com/SAP/fundamental-ngx/compare/v0.36.3-rc.20...v0.36.3-rc.21) (2022-11-04)
 
 

libs/docs/fn/select/examples/select-example/select-editable-example-component.ts

@@ -16,4 +16,12 @@ export class SelectEditableExampleComponent {
         'Tomato',
         'Strawberry'
     ];
+
+    options2: { name: string; kCal: string }[] = [
+        { name: 'Apple', kCal: '49.05' },
+        { name: 'Apple', kCal: '50' },
+        { name: 'Kiwi', kCal: '36' },
+        { name: 'Tomato', kCal: '24' },
+        { name: 'Strawberry', kCal: '32' }
+    ];
 }

libs/docs/fn/select/examples/select-example/select-editable-example.component.html

@@ -1,10 +1,20 @@
 <div style="width: 200px">
-    <fn-select [editable]="true" placeholder="Select an option" label="Editable Selector" #selectEditableExample>
-        <li fn-option *ngFor="let option of options" [value]="option">{{ option }}</li>
+    <fn-select [editable]="true" placeholder="Select an option" label="Editable Selector" #selectEditableExample1>
+        <li fn-option *ngFor="let option of options" [value]="option" [label]="option"></li>
     </fn-select>
 </div>
+
+<p>
+    <i>Editable Example selection: {{ selectEditableExample1.value }}</i>
+</p>
 <br />
 
+<div style="width: 200px">
+    <fn-select [editable]="true" placeholder="Select an option" label="Editable Selector" #selectEditableExample2>
+        <li fn-option *ngFor="let option of options2" [value]="option" [label]="option.name"></li>
+    </fn-select>
+</div>
+
 <p>
-    <i>Editable Example selection: {{ selectEditableExample.value }}</i>
+    <i>Editable Example selection: {{ selectEditableExample2.value | json }}</i>
 </p>

libs/docs/fn/select/examples/select-example/select-example-component.ts

@@ -6,4 +6,12 @@ import { Component } from '@angular/core';
 })
 export class SelectExampleComponent {
     options: string[] = ['Apple', 'Pineapple', 'Kiwi', 'Tomato', 'Strawberry'];
+
+    options2: { name: string; kCal: string }[] = [
+        { name: 'Apple', kCal: '49.05' },
+        { name: 'Pineapple', kCal: '50' },
+        { name: 'Kiwi', kCal: '36' },
+        { name: 'Tomato', kCal: '24' },
+        { name: 'Strawberry', kCal: '32' }
+    ];
 }

libs/docs/fn/select/examples/select-example/select-example.component.html

@@ -1,10 +1,20 @@
 <div style="width: 200px">
     <fn-select placeholder="Select an option" label="Standard Selector" #selectExample1>
-        <li fn-option *ngFor="let option of options" [value]="option">{{ option }}</li>
+        <li fn-option *ngFor="let option of options" [value]="option" [label]="option"></li>
     </fn-select>
 </div>
-<br />
 
 <p>
     <i>selection: {{ selectExample1.value }}</i>
 </p>
+<br />
+
+<div style="width: 200px">
+    <fn-select placeholder="Select an option" label="Standard Selector" #selectExample2>
+        <li fn-option *ngFor="let option of options2" [value]="option" [label]="option.name"></li>
+    </fn-select>
+</div>
+
+<p>
+    <i>selection: {{ selectExample2.value | json }}</i>
+</p>