Merge pull request #32 from vaibhavkhanna08/develop

Update Master branch code

.github/workflows/sast-and-package-prod.yml → .github/workflows/package-prod.yml

@@ -1,10 +1,10 @@
-name: Static Code Analysis and Package Prod
+name: Package Prod
 on:
   push:
     branches: [ "master"]
 
 jobs:
-  CodeQL:
+  Package:
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -23,49 +23,12 @@ jobs:
       with:
           java-version: '17'
           distribution: 'zulu'
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-          languages: javascript,typescript
-
+
     - name: Set up Node.js
       uses: actions/setup-node@v2
       with:
           node-version: 16
-
-    - name: Build with Yarn
-      run: |
-        yarn config set legacy-peer-deps true
-        yarn global add node-gyp
-        yarn add node-sass --force
-        yarn --force
-        yarn build
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-          languages: javascript,typescript
-
-  Packaging:
-    needs: CodeQL
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Setup JDK 17
-      uses: actions/setup-java@v2
-      with:
-        java-version: 17
-        distribution: 'zulu'
-
-    - name: Set up Node.js
-      uses: actions/setup-node@v2
-      with:
-          node-version: 16
-
+
     - name: Build with Yarn
       run: |
         yarn config set legacy-peer-deps true

.github/workflows/sast-and-package.yml → .github/workflows/package.yml

@@ -1,10 +1,10 @@
-name: Static Code Analysis and Package
+name: Package
 on:
   push:
     branches: [ "develop"]
 
 jobs:
-  CodeQL:
+  Package:
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -24,11 +24,6 @@ jobs:
           java-version: '17'
           distribution: 'zulu'
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-          languages: javascript,typescript
-
     - name: Set up Node.js
       uses: actions/setup-node@v2
       with:
@@ -42,38 +37,6 @@ jobs:
         yarn --force
         yarn build
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-          languages: javascript,typescript
-
-  Packaging:
-    needs: CodeQL
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Setup JDK 17
-      uses: actions/setup-java@v2
-      with:
-        java-version: 17
-        distribution: 'zulu'
-
-    - name: Set up Node.js
-      uses: actions/setup-node@v2
-      with:
-          node-version: 16
-
-    - name: Build with Yarn
-      run: |
-        yarn config set legacy-peer-deps true
-        yarn global add node-gyp
-        yarn add node-sass --force
-        yarn --force
-        yarn build
-        
     - name: Create WAR file
       run: jar -cvf ecd-ui-v1.0.war -C dist .     
 

.github/workflows/sast.yml

@@ -0,0 +1,58 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "develop" ]
+    paths-ignore:
+      - target/**
+      - dist/**
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "develop" ]
+    paths-ignore:
+      - target/**
+      - dist/**
+jobs:
+  analyze:
+    name: Analyze
+
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+
+
+
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.gitignore

@@ -40,3 +40,4 @@ testem.log
 # System files
 .DS_Store
 Thumbs.db
+/.vscode

pom.xml

@@ -205,27 +205,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.wildfly.plugins</groupId>
-				<artifactId>wildfly-maven-plugin</artifactId>
-				<version>1.2.1.Final</version>
-				<configuration>
-					<id>${server-id}</id>
-					<hostname>$${server-hostname}</hostname>
-					<port>$${server-port}</port>
-					<username>admin</username>
-					<password>ad@min123</password>
-
-				</configuration>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>deploy</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin> -->
 		</plugins>
 	</build>
 </project>