Skip to content

Commit 9b9f16f

Browse files
rezwanxrezwanx
authored
Merge pull request #805 from SELISEdigitalplatforms/stg
[RUSH 08/09/2025] Stg changes to prod
2 parents 53b22d5 + 29ff79a commit 9b9f16f

237 files changed

Lines changed: 20720 additions & 6971 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser',
3-
extends: [
4-
'eslint:recommended',
5-
'plugin:@typescript-eslint/recommended',
6-
'plugin:react/recommended',
7-
'plugin:react-hooks/recommended',
8-
],
3+
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'plugin:react/recommended', 'plugin:react-hooks/recommended', 'plugin:storybook/recommended'],
94
plugins: ['@typescript-eslint', 'react', 'react-hooks'],
105
env: {
116
browser: true,

‎.github/variables/vars.env‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ AUTHOR=seliseblocks
33
REPO_NAME=l3-react-blocks-construct
44
SOLUTION_NAME=construct
55
SERVICE_NAME=construct
6-
DOCKERFILE=Dockerfile
6+
DOCKERFILE=Dockerfile
7+
STORYBOOK_DOCKERFILE=storybook.Dockerfile

‎.github/workflows/3_stg_web.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,16 @@ jobs:
121121
resource-group: ${{ secrets.ClUSTER_RESOURCE_GROUP }}
122122
cluster-name: ${{ secrets.CLUSTER_NAME }}
123123

124+
125+
126+
- name: Add kubelogin
127+
uses: azure/use-kubelogin@v1
128+
with:
129+
kubelogin-version: "v0.0.24"
130+
131+
- name: Convert kubeconfig to use AAD
132+
run: |
133+
kubelogin convert-kubeconfig -l azurecli
124134
- name: Setup Helm Installer
125135
uses: Azure/setup-helm@v3.5
126136
with:

‎.github/workflows/3_web.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ jobs:
118118
resource-group: ${{ secrets.ClUSTER_RESOURCE_GROUP }}
119119
cluster-name: ${{ secrets.CLUSTER_NAME }}
120120

121+
122+
- name: Add kubelogin
123+
uses: azure/use-kubelogin@v1
124+
with:
125+
kubelogin-version: "v0.0.24"
126+
127+
- name: Convert kubeconfig to use AAD
128+
run: |
129+
kubelogin convert-kubeconfig -l azurecli
121130
- name: Setup Helm Installer
122131
uses: Azure/setup-helm@v3.5
123132
with:

‎.github/workflows/4_storybook.yml‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
name: Web-Build and push at ACR
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
CI_BUILD:
7+
required: true
8+
type: string
9+
VERSION:
10+
required: false
11+
type: string
12+
CONTAINER_NAME:
13+
required: true
14+
type: string
15+
NAMESPACE:
16+
required: true
17+
type: string
18+
SERVICE_NAME:
19+
required: true
20+
type: string
21+
CLUSTER_VALUES:
22+
required: true
23+
type: string
24+
25+
secrets:
26+
SELISE_GITHUB_PAT:
27+
required: true
28+
AZURE_CREDENTIALS:
29+
required: true
30+
AZURE_CONTAINER_REGISTRY:
31+
required: true
32+
ClUSTER_RESOURCE_GROUP:
33+
required: true
34+
CLUSTER_NAME:
35+
required: true
36+
ACR_RESOURCE_GROUP:
37+
required: true
38+
39+
env:
40+
SERVICE_TYPE: 'webclient'
41+
42+
jobs:
43+
integrateWeb:
44+
permissions:
45+
contents: read
46+
id-token: write
47+
runs-on: ubuntu-latest
48+
steps:
49+
#Checks out the repository this file is in
50+
- uses: actions/checkout@v3
51+
with:
52+
submodules: 'true'
53+
token: ${{ secrets.SELISE_GITHUB_PAT }}
54+
55+
- name: Update submodule
56+
run: |
57+
git submodule update --init
58+
- name: Set Environment Variables
59+
uses: ./.github/actions/setvars
60+
with:
61+
varFilePath: ./.github/variables/vars.env
62+
63+
# Logs in with your Azure credentials
64+
- name: Azure login
65+
uses: azure/login@v1.4.6
66+
with:
67+
creds: ${{ secrets.AZURE_CREDENTIALS }}
68+
69+
- name: Remove invisible CSS classes
70+
run: |
71+
sed -i '/<div className="w-full invisible h-0">/s/invisible h-0//g' src/pages/auth/signin/signin-page.tsx
72+
73+
- name: Build and push image to ACR
74+
run: |
75+
az acr build \
76+
--image ${{ secrets.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ inputs.CONTAINER_NAME }}:${{ github.sha }} \
77+
--registry ${{ secrets.AZURE_CONTAINER_REGISTRY }} -g ${{ secrets.ACR_RESOURCE_GROUP }} \
78+
--file ${{ env.STORYBOOK_DOCKERFILE }} \
79+
--build-arg ci_build=${{ inputs.CI_BUILD }} .
80+
81+
deployWebToK8s:
82+
needs: [integrateWeb]
83+
permissions:
84+
contents: read
85+
id-token: write
86+
runs-on: ubuntu-latest
87+
steps:
88+
#Checks out the repository this file is in
89+
- uses: actions/checkout@v3
90+
with:
91+
submodules: 'true'
92+
token: ${{ secrets.SELISE_GITHUB_PAT }}
93+
94+
- name: Update submodule
95+
run: |
96+
git submodule update --init
97+
- name: Set Environment Variables
98+
uses: ./.github/actions/setvars
99+
with:
100+
varFilePath: ./.github/variables/vars.env
101+
102+
# Logs in with your Azure credentials
103+
- name: Azure login
104+
uses: azure/login@v1.4.6
105+
with:
106+
creds: ${{ secrets.AZURE_CREDENTIALS }}
107+
- name: pull helm repo
108+
uses: actions/checkout@v3
109+
with:
110+
repository: SELISEdigitalplatforms/l0-yml-infrastructure-helm
111+
token: ${{ secrets.SELISE_GITHUB_PAT }}
112+
113+
# Retrieves your Azure Kubernetes Service cluster's kubeconfig file
114+
- name: Get K8s context
115+
uses: azure/aks-set-context@v3
116+
with:
117+
resource-group: ${{ secrets.ClUSTER_RESOURCE_GROUP }}
118+
cluster-name: ${{ secrets.CLUSTER_NAME }}
119+
120+
121+
122+
- name: Add kubelogin
123+
uses: azure/use-kubelogin@v1
124+
with:
125+
kubelogin-version: "v0.0.24"
126+
127+
- name: Convert kubeconfig to use AAD
128+
run: |
129+
kubelogin convert-kubeconfig -l azurecli
130+
- name: Setup Helm Installer
131+
uses: Azure/setup-helm@v3.5
132+
with:
133+
token: ${{ secrets.SELISE_GITHUB_PAT }}
134+
135+
- name: Deploy To Kubernetes
136+
run: |
137+
helm upgrade \
138+
--install ${{inputs.CONTAINER_NAME}} ./new-templates/ecap3-${{env.SERVICE_TYPE}}/ \
139+
--namespace=${{inputs.NAMESPACE}} \
140+
--values ./${{inputs.CLUSTER_VALUES}}/${{inputs.SERVICE_NAME}}-storybook.values.yaml \
141+
--set image.repository=${{ secrets.AZURE_CONTAINER_REGISTRY }}.azurecr.io/${{ inputs.CONTAINER_NAME }} \
142+
--set image.tag=${{ github.sha }} \
143+
--set fullnameOverride=${{inputs.CONTAINER_NAME}} \
144+
--set ingress.hosts[0].paths[0].path="/"

‎.github/workflows/dev.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,26 @@ jobs:
4747
ClUSTER_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_RESOURCE_GROUP }}
4848
CLUSTER_NAME: ${{ secrets.AKS_BLOCKS_DEV_CLUSTER }}
4949
ACR_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_RESOURCE_GROUP }}
50+
needs: [sonarqube-job]
51+
52+
storybook-job:
53+
permissions:
54+
contents: read
55+
id-token: write
56+
if: ${{ github.event_name == 'push' }}
57+
uses: ./.github/workflows/4_storybook.yml
58+
with:
59+
CONTAINER_NAME: 'dev-$SERVICE_NAME-storybook'
60+
NAMESPACE: 'dev-$REPO_NAME'
61+
SERVICE_NAME: $SERVICE_NAME
62+
CLUSTER_VALUES: "aks-blocks-stg"
63+
# CI_BUILD: 'build-dev'
64+
CI_BUILD: 'storybook-dev'
65+
secrets:
66+
SELISE_GITHUB_PAT: ${{ secrets.SELISE_GITHUB_PAT }}
67+
AZURE_CREDENTIALS: ${{ secrets.AZURE_AKS_BLOCKS_CREDENTIALS }}
68+
AZURE_CONTAINER_REGISTRY: ${{ secrets.AZURE_BLOCKS_CONTAINER_REGISTRY }}
69+
ClUSTER_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_RESOURCE_GROUP }}
70+
CLUSTER_NAME: ${{ secrets.AKS_BLOCKS_DEV_CLUSTER }}
71+
ACR_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_RESOURCE_GROUP }}
5072
needs: [sonarqube-job]

‎.github/workflows/main.yml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,23 @@ jobs:
5353
ClUSTER_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_PROD_RESOURCE_GROUP }}
5454
CLUSTER_NAME: ${{ secrets.AKS_BLOCKS_PROD_CLUSTER }}
5555
ACR_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_PROD_RESOURCE_GROUP }}
56-
# needs: [sonarqube-job]
56+
# needs: [sonarqube-job]
57+
# storybook-job:
58+
# if: ${{ github.event_name == 'push' }}
59+
# permissions:
60+
# contents: read
61+
# id-token: write
62+
# uses: ./.github/workflows/4_storybook.yml
63+
# with:
64+
# CONTAINER_NAME: 'prod-$SERVICE_NAME-storybook'
65+
# NAMESPACE: 'prod-$REPO_NAME'
66+
# SERVICE_NAME: $SERVICE_NAME
67+
# CI_BUILD: 'storybook-prod'
68+
# secrets:
69+
# SELISE_GITHUB_PAT: ${{ secrets.SELISE_GITHUB_PAT }}
70+
# AZURE_CREDENTIALS: ${{ secrets.AZURE_AKS_BLOCKS_PROD_CREDENTIALS }}
71+
# AZURE_CONTAINER_REGISTRY: ${{ secrets.AZURE_BLOCKS_PROD_CONTAINER_REGISTRY }}
72+
# ClUSTER_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_PROD_RESOURCE_GROUP }}
73+
# CLUSTER_NAME: ${{ secrets.AKS_BLOCKS_PROD_CLUSTER }}
74+
# ACR_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_PROD_RESOURCE_GROUP }}
75+
# # needs: [sonarqube-job]

‎.github/workflows/stg.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,24 @@ jobs:
4545
CLUSTER_NAME: ${{ secrets.AKS_BLOCKS_DEV_CLUSTER }}
4646
ACR_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_RESOURCE_GROUP }}
4747
# needs: [sonarqube-job]
48+
49+
storybook-job:
50+
if: ${{ github.event_name == 'push' }}
51+
permissions:
52+
contents: read
53+
id-token: write
54+
uses: ./.github/workflows/4_storybook.yml
55+
with:
56+
CONTAINER_NAME: 'stg-$SERVICE_NAME-storybook'
57+
NAMESPACE: 'stg-$REPO_NAME'
58+
SERVICE_NAME: $SERVICE_NAME
59+
CLUSTER_VALUES: "aks-blocks-stg"
60+
CI_BUILD: 'storybook-stg'
61+
secrets:
62+
SELISE_GITHUB_PAT: ${{ secrets.SELISE_GITHUB_PAT }}
63+
AZURE_CREDENTIALS: ${{ secrets.AZURE_AKS_BLOCKS_CREDENTIALS }}
64+
AZURE_CONTAINER_REGISTRY: ${{ secrets.AZURE_BLOCKS_CONTAINER_REGISTRY }}
65+
ClUSTER_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_RESOURCE_GROUP }}
66+
CLUSTER_NAME: ${{ secrets.AKS_BLOCKS_DEV_CLUSTER }}
67+
ACR_RESOURCE_GROUP: ${{ secrets.ClUSTER_AKS_BLOCKS_RESOURCE_GROUP }}
68+
# needs: [sonarqube-job]

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,6 @@ logs
5959
# System Files
6060
.DS_Store
6161
Thumbs.db
62+
63+
*storybook.log
64+
storybook-static

‎.storybook/main.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import type { StorybookConfig } from '@storybook/react-webpack5';
2+
3+
const config: StorybookConfig = {
4+
stories: [
5+
'../src/stories/blocks/**/*.stories.@(js|jsx|mjs|ts|tsx)',
6+
'../src/stories/ui/**/*.stories.@(js|jsx|mjs|ts|tsx)',
7+
'../src/**/*.mdx',
8+
],
9+
addons: [
10+
'@storybook/preset-create-react-app',
11+
'@storybook/addon-docs',
12+
'@storybook/addon-onboarding',
13+
'@storybook/addon-styling-webpack',
14+
],
15+
framework: {
16+
name: '@storybook/react-webpack5',
17+
options: {},
18+
},
19+
staticDirs: ['../public'],
20+
};
21+
export default config;

0 commit comments

Comments
 (0)