Skip to content
Merged

Dev #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
18dfbfa
workflow check
RohitKini Apr 23, 2025
cbad76a
Merge pull request #620 from contentstack/feature/workflow
RohitKini Apr 23, 2025
528461a
workflow check
RohitKini Apr 23, 2025
bb64515
Merge pull request #621 from contentstack/feature/workflow
RohitKini Apr 23, 2025
b871c7f
workflow check
RohitKini Apr 23, 2025
6d093c7
Merge pull request #622 from contentstack/feature/workflow
RohitKini Apr 23, 2025
7e9c82b
workflow check
RohitKini Apr 23, 2025
1994a05
Merge pull request #623 from contentstack/feature/workflow
RohitKini Apr 23, 2025
9aa6815
workflow check
RohitKini Apr 23, 2025
437d0fc
Merge pull request #624 from contentstack/feature/workflow
RohitKini Apr 23, 2025
f6caba2
workflow check
RohitKini Apr 23, 2025
461efa5
Merge pull request #625 from contentstack/feature/workflow
RohitKini Apr 23, 2025
61a900f
workflow check
RohitKini Apr 23, 2025
5f542df
Merge pull request #626 from contentstack/feature/workflow
RohitKini Apr 23, 2025
f761b38
workflow check
RohitKini Apr 23, 2025
0cec43e
Merge pull request #627 from contentstack/feature/workflow
RohitKini Apr 23, 2025
17ea080
workflow for all
RohitKini Apr 23, 2025
c5b97d8
Merge pull request #628 from contentstack/feature/workflow
RohitKini Apr 23, 2025
05c59b3
test
RohitKini Apr 23, 2025
7ec8522
Merge pull request #629 from contentstack/feature/workflow
RohitKini Apr 23, 2025
45d3e83
test 123
RohitKini Apr 23, 2025
5f2d302
fix:removed mapping for custom and modular block for existing stack case
AishDani Apr 23, 2025
d3d349d
Merge pull request #630 from contentstack/feature/workflow
RohitKini Apr 23, 2025
7135818
fix:added await in reset function and removed type for app and extens…
AishDani Apr 23, 2025
4a3764c
Added icon for marketplace app and updated icons with v2 in schema modal
sayalijoshi27 Apr 23, 2025
9aa6d79
Conflict resolved
sayalijoshi27 Apr 23, 2025
2c80886
fix:refactored the key for disabling the Advanced properties for titl…
AishDani Apr 23, 2025
54627ed
Tag line height corrected and axios version update
sayalijoshi27 Apr 23, 2025
2a9f9a8
Merge pull request #631 from contentstack/feature/dropdown-field-choices
sayalijoshi27 Apr 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions .github/workflows/repo-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ jobs:
git gc --prune=now # Garbage collect and prune unreachable objects

# echo "Installing ESLint dependencies..."
npm install --save-dev eslint @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser

npm install --save-dev eslint eslint-plugin-import @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser

if [ ! -f "eslint.config.cjs" ]; then
echo "Creating default ESLint config..."
cat <<EOL > eslint.config.cjs
const js = require("@eslint/js");
const globals = require("globals");
const tsPlugin = require("@typescript-eslint/eslint-plugin");
const importPlugin = require("eslint-plugin-import");

module.exports = [
js.configs.recommended,
Expand All @@ -119,6 +119,7 @@ jobs:
},
plugins: {
"@typescript-eslint": tsPlugin,
import: importPlugin,
},
rules: {
"no-unused-vars": "warn",
Expand All @@ -128,6 +129,7 @@ jobs:
"@typescript-eslint/no-explicit-any": "off",
"no-constant-condition": "off",
"no-constant-binary-expression": "off",
"import/no-unresolved": 'off',
}
}
];
Expand All @@ -148,7 +150,6 @@ jobs:
# ts-prune | awk '{print $1}' | xargs rm -f

rsync -av --delete ${{ env.RSYNC_SITECORE_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/
rsync -av --delete ../cli/ ./cli/
rsync -av --delete ../ui/ ./ui/
rsync -av --delete ${{ env.RSYNC_SITECORE_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/
rsync -av --delete ../upload-api/migration-sitecore/ ./upload-api/migration-sitecore/
Expand Down Expand Up @@ -234,30 +235,38 @@ jobs:
git gc --prune=now # Garbage collect and prune unreachable objects

echo "Installing ESLint dependencies..."
npm install --save-dev eslint @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser
npm install --save-dev eslint eslint-plugin-import @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser


if [ ! -f "eslint.config.cjs" ]; then
echo "Creating default ESLint config..."
cat <<EOL > eslint.config.cjs
const js = require("@eslint/js");
const globals = require("globals");

const tsPlugin = require("@typescript-eslint/eslint-plugin");
const importPlugin = require("eslint-plugin-import");
module.exports = [
js.configs.recommended,
{
languageOptions: {
ecmaVersion: "latest",
sourceType: "module",
globals: globals.node,
parser: require("@typescript-eslint/parser"),
},
plugins: {
"@typescript-eslint": tsPlugin,
import: importPlugin,
},
rules: {
"no-unused-vars": "warn",
"no-console": "off",
"@typescript-eslint/no-var-requires": 'off',
"@typescript-eslint/no-var-requires": "off",
"no-prototype-builtins": "off",
"@typescript-eslint/no-explicit-any": "off",
"no-constant-condition": "off"
"no-constant-condition": "off",
"no-constant-binary-expression": "off",
"import/no-unresolved": 'off',
}
}
];
Expand All @@ -279,7 +288,6 @@ jobs:
ts-prune | awk '{print $1}' | xargs rm -f

rsync -av --delete ${{ env.RSYNC_CONTENTFUL_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/
rsync -av --delete ../cli/ ./cli/
rsync -av --delete ../ui/ ./ui/
rsync -av --delete ${{ env.RSYNC_CONTENTFUL_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/
rsync -av --delete ../upload-api/migration-contentful/ ./upload-api/migration-contentful/
Expand Down Expand Up @@ -332,30 +340,38 @@ jobs:
git gc --prune=now # Garbage collect and prune unreachable objects

echo "Installing ESLint dependencies..."
npm install --save-dev eslint @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser
npm install --save-dev eslint eslint-plugin-import @eslint/js globals @typescript-eslint/eslint-plugin @typescript-eslint/parser


if [ ! -f "eslint.config.cjs" ]; then
echo "Creating default ESLint config..."
cat <<EOL > eslint.config.cjs
const js = require("@eslint/js");
const globals = require("globals");

const tsPlugin = require("@typescript-eslint/eslint-plugin");
const importPlugin = require("eslint-plugin-import");
module.exports = [
js.configs.recommended,
{
languageOptions: {
ecmaVersion: "latest",
sourceType: "module",
globals: globals.node,
parser: require("@typescript-eslint/parser"),
},
plugins: {
"@typescript-eslint": tsPlugin,
import: importPlugin,
},
rules: {
"no-unused-vars": "warn",
"no-console": "off",
"@typescript-eslint/no-var-requires": 'off',
"@typescript-eslint/no-var-requires": "off",
"no-prototype-builtins": "off",
"@typescript-eslint/no-explicit-any": "off",
"no-constant-condition": "off"
"no-constant-condition": "off",
"no-constant-binary-expression": "off",
"import/no-unresolved": 'off',
}
}
];
Expand All @@ -377,7 +393,6 @@ jobs:
ts-prune | awk '{print $1}' | xargs rm -f

rsync -av --delete ${{ env.RSYNC_WORDPRESS_API_SRC_SERVICES_EXCLUDES }} ../api/ ./api/
rsync -av --delete ../cli/ ./cli/
rsync -av --delete ../ui/ ./ui/
rsync -av --delete ${{ env.RSYNC_WORDPRESS_UPLOAD_API_SRC_EXCLUDES }} ../upload-api/src/ ./upload-api/src/
rsync -av --delete ../upload-api/migration-wordpress/ ./upload-api/migration-wordpress/
Expand Down
2 changes: 1 addition & 1 deletion api/src/services/contentMapper.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ const updateContentMapper = async (req: Request) => {
)) as number;

try {
ProjectModelLowdb.update((data: any) => {
await ProjectModelLowdb.update((data: any) => {
data.projects[projectIndex].mapperKeys = content_mapper;
data.projects[projectIndex].updated_at = new Date().toISOString();
});
Expand Down
4 changes: 4 additions & 0 deletions api/src/services/contentful.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import jsonRTE from "./contentful/jsonRTE.js";
import { getAllLocales, getLogMessage } from "../utils/index.js";
import customLogger from "../utils/custom-logger.utils.js";





const {
DATA,
// DIR
Expand Down
3 changes: 3 additions & 0 deletions api/src/services/sitecore.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import { getLogMessage } from '../utils/index.js';
import customLogger from '../utils/custom-logger.utils.js';
import { getSafePath } from '../utils/sanitize-path.utils.js';




const append = 'a';
const baseDirName = MIGRATION_DATA_CONFIG.DATA;
const {
Expand Down
4 changes: 4 additions & 0 deletions api/src/services/wordpress.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import { getLogMessage } from "../utils/index.js";
import { v4 as uuidv4 } from "uuid";
import { orgService } from "./org.service.js";





const { JSDOM } = jsdom;
const virtualConsole = new jsdom.VirtualConsole();
// Get the current file's path
Expand Down
Loading