Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feature/application-template

Author: eshankvaish

.eslintignore

@@ -1,4 +1,5 @@
 .eslintrc.cjs
+scripts/*.cjs
 
 # Files with ESLint errors/warnings
 src/Common/AddCDButton/AddCDButton.tsx
@@ -13,19 +14,16 @@ src/Common/Checkbox.tsx
 src/Common/ClipboardButton/__tests__/ClipboardButton.test.tsx
 src/Common/CodeEditor/CodeEditor.tsx
 src/Common/Common.service.ts
-src/Common/CustomInput/CustomInput.tsx
 src/Common/CustomTagSelector/PropagateTagInfo.tsx
 src/Common/CustomTagSelector/TagDetails.tsx
 src/Common/CustomTagSelector/TagLabelValueSelector.tsx
 src/Common/CustomTagSelector/ValidationRules.ts
 src/Common/DebouncedSearch/DebouncedSearch.tsx
 src/Common/DebouncedSearch/Utils.ts
 src/Common/DebouncedSearch/__tests__/DebouncedSearch.test.tsx
-src/Common/DeleteComponentModal/DeleteComponent.tsx
 src/Common/DevtronProgressing/DevtronProgressing.tsx
 src/Common/Dialogs/ConfirmationDialog.tsx
 src/Common/Dialogs/DialogForm.tsx
-src/Common/Dialogs/ForceDeleteDialog.tsx
 src/Common/DraggableWrapper/DraggableButton.tsx
 src/Common/DraggableWrapper/DraggableWrapper.tsx
 src/Common/Drawer/Drawer.tsx
@@ -42,7 +40,6 @@ src/Common/Modals/VisibleModal2.tsx
 src/Common/MultiSelectCustomization.tsx
 src/Common/PopupMenu.tsx
 src/Common/Progressing.tsx
-src/Common/RJSF/Form.tsx
 src/Common/RJSF/config.ts
 src/Common/RJSF/templates/ArrayFieldTemplate.tsx
 src/Common/RJSF/templates/BaseInput.tsx

.eslintrc.cjs

@@ -122,7 +122,13 @@ module.exports = {
                             {
                                 name: 'react-toastify',
                                 message: 'Please use "ToastManager.showToast" instead.',
-                            }
+                            },
+                        ],
+                        patterns: [
+                            {
+                                group: ['IconBase'],
+                                message: 'Please use "Icon" component instead.',
+                            },
                         ],
                     },
                 ],

.husky/pre-commit

@@ -17,5 +17,35 @@
 
 . "$(dirname "$0")/_/husky.sh"
 
-npx tsc --noEmit
-npm run lint-staged
+echo "Running pre-commit hook..."
+
+# Check for changes in the Icon folder
+CHANGED_FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep -E 'IconV2/|generate-icon.cjs' || true)
+
+if [ -n "$CHANGED_FILES" ]; then
+    echo "Changes detected in the Icon folder or icon generation script. Running icon generation script..."
+    
+    if ! npm run generate-icon; then
+        echo "Error: Icon generation script failed."
+        exit 1
+    fi
+    
+    echo "Icon.tsx updated. Adding to commit."
+    git add src/Shared/Components/Icon/Icon.tsx
+else
+    echo "No changes in the IconsV2 folder. Skipping icon generation."
+fi
+
+# TypeScript check
+if ! npx tsc --noEmit; then
+    echo "Error: TypeScript check failed."
+    exit 1
+fi
+
+# Lint-staged
+if ! npm run lint-staged; then
+    echo "Error: Lint-staged failed."
+    exit 1
+fi
+
+echo "Pre-commit hook completed successfully."