Skip to content

feat/CS-36487-branches-compare-merge #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 59 commits into from
Apr 26, 2023
Merged

feat/CS-36487-branches-compare-merge #50

merged 59 commits into from
Apr 26, 2023

Conversation

@nadeem-cs
Copy link
Contributor

@nadeem-cs nadeem-cs commented Apr 24, 2023

No description provided.

uttamukkoji and others added 30 commits June 2, 2022 11:58
@uttamukkoji
Package dependencies updated test folder restored
fef1e0c
@uttamukkoji
Type definition added
d30f68d
@contentstack-admin
Create codeql-analysis.yml
4af8012
@contentstack-admin
Create secrets-scan.yml
2f2bd2a
@contentstack-admin
Create sca-monitor.yml
e62f17e
@contentstack-admin
Create sca-scan.yml
d4255c8
@contentstack-admin
Create sast-scan.yml
9244217
@uttamukkoji
Package version updated
dcaa6b1
@uttamukkoji
Merge pull request #24 from contentstack/feature/typedefination
2e9d5a6 
Typedefination added to support typescript
@contentstack-admin
Update codeql-analysis.yml
67c6973
@uttamukkoji
Workflow Stage for entry
c11ef78 
- Autorisation token
- Update User roles from Stack
- GitHub action for Package publish
@uttamukkoji
Asset download functionality added
341e11e
@uttamukkoji
entry doc udpdate
8311a77
@uttamukkoji
ignore github workflow in package publish
5bec03b
@uttamukkoji
Docs update
1805689
@uttamukkoji
stack branch config added
2198718
@uttamukkoji
Stack config update for api key mandatory
39459e7
@uttamukkoji
Create entry docs update
7d86c88
@uttamukkoji
Update types
b79382f
@uttamukkoji
Merge pull request #25 from contentstack/bugs/entry-workflow-stage
7e6ff6e 
Entry workflow stage, Asset Download
@uttamukkoji
👷 Apps API implementation
baf2c32
@uttamukkoji
Merge branch 'master' into feature/marketplace-app
4140b49
@uttamukkoji
feat: 🚧 App installation Api implemented
8bd1095
@uttamukkoji
feat: 🚧 Installation API test implemented
221618e
@uttamukkoji
feat: 🚧 App installation TS API test added
a8f682c
@uttamukkoji
feat: ✨ Marketplace app implementation done
ebc60c3
@aravindbuilt
Update codeql-analysis.yml
1b32485
@aravindbuilt
Delete sca-monitor.yml
ba36679
@aravindbuilt
Add files via upload
7017a20
@uttamukkoji
refactor: 📝 License, Readme and terser
8941cbd
uttamukkoji and others added 25 commits October 3, 2022 11:55
@uttamukkoji
Merge branch 'master' of https://github.com/contentstack/contentstack…
b6e63dd 
…-management-javascript
@uttamukkoji
Refresh token on Unauthorized request
430161a
@aravindbuilt
jira.yml
efe7609
@aravindbuilt
jira.yml
4f8fcf8
@uttamukkoji
Package version Update
ea168dd
@uttamukkoji
Refresh token promise added
ab1b3bc
@uttamukkoji
Merge pull request #31 from contentstack/feature/refresh-token
ca1eeb6 
Token refresh support added
@uttamukkoji
Stack fetch with org uid issue resolved
136d182
@uttamukkoji
removed white space
bd69810
@uttamukkoji
Comment added for synk issue
280c257
@uttamukkoji
Merge pull request #37 from contentstack/bugs/sso-stack-fetch
ae95b82 
Stack fetch with org uid on Authorization
@aravindbuilt
sca-scan.yml
12c9608
@nadeem-cs
Merge branch 'master' of https://github.com/contentstack/contentstack…
69b6018 
…-management-javascript
@nadeem-cs
feat: ✨ added compare and merge functionality for branches with unit …
b5a4514 
…test cases [CS-36688]

A new branch is created for the feature as the prev branch `CS-36487-branch-compare-merge` encountered many merge conflicts.
@nadeem-cs
test: ✅ added compare and merge api tests [CS-36688]
a84c8a9
@nadeem-cs
test: ✅ modified api tests for merge api changes [CS-36688]
8ead2bd
@nadeem-cs
test: changes based on PR feedback [CS-36688]
252b14e
@nadeem-cs
refactor: added ts interface functions [CS-36688]
bd8eea4
@nadeem-cs
refactor: changed URL for compare and merge from api to v3 [CS-36688]
d93625a
@nadeem-cs
refactor: ♻️ modified unit test cases after URL change and modified b…
3f229c9 
…ulkOperations [CS-37552]

bulkOperation modifications include adding of optional api_version parameter in publish and unpublish functions
@nadeem-cs
test: ✅ added api test for bulk operations publish and unpublish
1b7a2c1
@uttamukkoji
fix: ♻️ change url path for compare and merge apis
03ca336
@uttamukkoji
Merge branch 'master' into feat/CS-36487-branches-compare-merge
4a65018
@nadeem-cs
fix: 🩹 fixed mergeQueue funciton return type
821c112
@nadeem-cs
Merge branch 'feat/CS-36487-branches-compare-merge' of https://github…
b76a624 
….com/contentstack/contentstack-management-javascript into feat/CS-36487-branches-compare-merge
@nadeem-cs nadeem-cs requested a review from a team as a code owner April 24, 2023 08:36
@nadeem-cs nadeem-cs requested a review from a team April 24, 2023 08:36
@github-actions
Copy link

github-actions bot commented Apr 24, 2023

Coverage report for commit: b76a624
File: coverage/clover.xml

Cover ┌─────────────────────────┐ Freq.
   0% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  10% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  20% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  30% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  40% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  50% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  60% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  70% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  80% │ █░░░░░░░░░░░░░░░░░░░░░░ │  2.7%
  90% │ ███░░░░░░░░░░░░░░░░░░░░ │  8.1%
 100% │ ███████████████████████ │ 89.2%
      └─────────────────────────┘
 *Legend:* █ = Current Distribution
Summary - Lines: 97.63% | Methods: 98.11% | Branchs: 69.15%
FilesLinesMethodsBranchs
lib/app/authorization
   index.js100.00%100.00%70.27%
lib/app/hosting
   deployment.js100.00%100.00%58.46%
   index.js100.00%100.00%55.93%
lib/app
   index.js100.00%100.00%60.00%
lib/app/installation
   index.js100.00%100.00%57.53%
lib/app/request
   index.js100.00%100.00%65.71%
lib
   contentstack.js100.00%100.00%100.00%
   contentstackClient.js100.00%100.00%82.14%
   contentstackCollection.js100.00%100.00%100.00%
   entity.js92.39%90.00%58.56%
lib/core
   Util.js90.57%100.00%73.81%
   concurrency-queue.js93.45%96.55%85.84%
   contentstackError.js100.00%100.00%100.00%
   contentstackHTTPClient.js97.92%100.00%94.12%
lib/organization
   index.js100.00%100.00%50.00%
lib/query
   index.js96.30%100.00%62.79%
lib/stack/asset/folders
   index.js100.00%100.00%100.00%
lib/stack/asset
   index.js96.00%91.67%56.36%
lib/stack/branch
   compare.js75.00%100.00%68.97%
   index.js100.00%100.00%72.73%
   mergeQueue.js100.00%100.00%68.75%
lib/stack/branchAlias
   index.js100.00%100.00%60.71%
lib/stack/contentType/entry
   index.js100.00%100.00%65.12%
lib/stack/contentType
   index.js100.00%100.00%80.00%
lib/stack/deliveryToken
   index.js100.00%100.00%87.50%
lib/stack/environment
   index.js100.00%100.00%100.00%
lib/stack/extension
   index.js100.00%100.00%84.85%
lib/stack/globalField
   index.js100.00%100.00%70.59%
lib/stack
   index.js98.48%96.55%75.96%
lib/stack/label
   index.js100.00%100.00%100.00%
lib/stack/locale
   index.js100.00%100.00%100.00%
lib/stack/release
   index.js100.00%100.00%62.50%
lib/stack/roles
   index.js100.00%100.00%100.00%
lib/stack/webhook
   index.js100.00%100.00%63.41%
lib/stack/workflow
   index.js100.00%100.00%63.83%
lib/stack/workflow/publishRules
   index.js100.00%100.00%100.00%
lib/user
   index.js100.00%100.00%72.22%

🤖 comment via lucassabreu/comment-coverage-clover

@nadeem-cs nadeem-cs merged commit ecbf01c into next Apr 26, 2023
@nadeem-cs nadeem-cs deleted the feat/CS-36487-branches-compare-merge branch April 26, 2023 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@nadeem-cs @uttamukkoji @contentstack-admin @aravindbuilt