Commit Graph

1267 Commits

Author SHA1 Message Date
Abhijeet
860318e0fe
chore: Add stopwatch to log execution time by process name (#11069)
* Add stopwatch to log execution time by process name

* Refactor
2022-02-10 16:59:26 +05:30
Abhijeet
ee6d639e42
chore: Update error handling for resource not found exception for clone, fork and import APIs #11044 2022-02-10 10:26:07 +05:30
Nayan
a5dec675b1
feat: Added application templates (#10952)
Added the required BE API for application templates. It gets templates from Appsmith cloud services through REST API.
2022-02-09 23:13:31 +06:00
Anagh Hegde
b1055cc94d
feat: Add gitHosting provider to analytics (#11036)
* Add gitHosting provider to analytics

* Add support for git provierders like bitbucket

* Change the logic to get provider name
2022-02-09 16:41:19 +00:00
Trisha Anand
d7ce026b93
Minor refactor of code to avoid merge conflicts. (#11039) 2022-02-09 13:53:57 +00:00
Shrikant Sharat Kandula
6e1e2faaac
chore: Anonymous stats if telemetry is enabled (#11014)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-02-09 10:31:00 +05:30
Sumit Kumar
aa2290405d
fix: fix refresh token flow in REST API OAuth (#10875)
Co-authored-by: Segun Daniel Oluwadare <dodanieloluwadare@gmail.com>
2022-02-09 09:38:58 +05:30
Abhijeet
fa0e900f3f
fix: Sort unordered set elements before committing to git repo so as to have same serialised output string for identical set of elements (#10933) 2022-02-08 00:48:20 +05:30
Abhijeet
fba0fc2fd7
chore: Remove git feature-flag (#10914)
* Remove git feature-flag
2022-02-07 06:46:15 +00:00
Anagh Hegde
fa06473d63
fix: Delete the pages post merge operation from application when they are removed from file system (#10810)
* Delete the pages post merge operation from application if they are removed from file system

* Changes per review

* Add tests

* changes per review

* Use string utils for null check

* Change per review

* Fix tests

* Fix tcs
2022-02-04 12:07:07 +05:30
Abhijeet
2e5c1ea4ec
chore: Update doc urls for errors related to git (#10852)
* Update doc urls for errors and SSH key response
2022-02-03 21:13:40 +05:30
Abhijeet
7329d7ff23
fix: Fix NPE during import application when page ids are missing for published action and actionCollection (#10858)
* Provide a fallback pageIds for missing ones in action and JSObjects published version

* Add TC
2022-02-03 20:08:58 +05:30
Abhijeet
e356fd039f
chore: Commit only unpublished resources to git repo which includes queries, JSObjects, pages to avoid data duplication (#10776)
* Commit only unpublished resources to avoid resolving merge conflicts twice

* Added TCs

* Update directory names, fix pull issue in JSObjects
2022-02-03 11:47:57 +00:00
Keyur Paralkar
da638d7f2b
Updated Template (#10853)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-02-03 15:23:56 +05:30
Abhijeet
0b1a8ad20b
fix: Update ApplicationPageId with defaultPageId while fetching applications for homepage (#10812) 2022-02-03 10:56:35 +05:30
Tolulope Adetula
bb2f7da823
feat: Select and Multiselect V2 (#10359)
* fix: Select V2

* Fix: CI Fail

* fix: failing test

* fix: failing test

* Fix: MultiSelect

* Fix: loading issue

* Fix: loadin state

* Fix: loading

* fix: failing test

* fix: evaluation tests

* Fix: failing tests

* Fix: failing test

* fix: failing tests

* Fix: Failing tests

* fix: select All

* fix: filtering

* Fix: filtering

* fix: refactor Select widget

* fix: hide MultiSelect

* fix: select options

* Fix: failing tests

* fix: failing tests

* Fix: issues

* Update system-themes.json

* Update system-themes.json

* Update system-themes.json

* Update system-themes.json

* fix: PR reviews

* Update EntityDefinitions.ts

* Fix: issues

* fix: console

* fix: QA issues

* fix: options issues

* fix: add widget icons

* fix: update Selectv2

* empty commit to fix CI

* fix: failing test
2022-02-02 06:15:07 -08:00
Nidhi
bc93a1d413
fix: Removed filter of JS actions from get method (#10726) 2022-02-02 08:28:41 +00:00
Nidhi
b02a7f53f6
fix: Disabled generate CRUD page feature for MsSQL (#10811) 2022-02-02 08:27:59 +00:00
Keyur Paralkar
2ec0d2b02a
fix: Updated Template (#10694)
* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-02-02 12:50:21 +05:30
Abhijeet
6b1e3fe7c0
fix: Add branch param for redirect url while authorising Google Sheet when application is connected to git (#10715)
* Add branch param in the redirect url
2022-01-31 10:11:12 +05:30
Abhijeet
8c4d711f5b
chore: Make sure to keep forked application in valid state even if client exits the flow before server responds (#10704) 2022-01-30 17:43:35 +05:30
Shrikant Sharat Kandula
d3d1f8bbf9
Clear sessions on password reset (#9955)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Nayan <nayan@appsmith.com>
2022-01-28 16:49:00 +05:30
Shrikant Sharat Kandula
cc3ab115b5
Remove CORS config as it's unused now (#10312)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-01-28 16:48:04 +05:30
Abhijeet
07082f6bde
fix: Copy evaluation version for cloned application from the source application to fix dynamic binding evaluation to support escaped characters without double escapes (#10702) 2022-01-28 08:07:59 +00:00
Abhijeet
8d93d06317
feat: Add reference doc url for error responses for git APIs (#10620)
* Added reference doc urls for pull conflicts

* Update TCs
2022-01-27 13:08:21 +05:30
Anagh Hegde
e0e4a73650
fix: Logic to delete stale git branch which are not in db (#10647) 2022-01-26 21:29:00 +05:30
Anagh Hegde
c83f7fb3c1
feat: Git import api (#10282)
* Added API to generate deploy keys and store them in a collection for import flow

* Add tests for the key generation flow

* Move the key generation to helper class

* changes per review

* Fix bad merge

* add api to import application

* handle timeout for git import

* Update the comments

* Add API for git import

* handle duplicate application name error & add profiles while importing

* Add tests for import api

* Hydrate from file system after cloning the repo

* Fix test failures

* Test cases

* changes per review

* throw error when the datasource with same name of different type exists

* Fix test failures

* Fis error messages

* Fix test failures

* Fix issue with checking the datasource types

* Add datasource name check while importing the application

* Refactor SSH key gen code for import

* Resolve issues around defaultResourceIds, don't commit app name

* Resolve the issue related to duplicate name for app during import

* Minor fixes

* WIP

* Add logic to get unconfigured datasources for the application

* Fix tests

* WIP

* revert datasource related changes

* Add a boolean flag to Datasource entity

* Add a boolean flag to Datasource entity

* Add flag to identify import status

* Set application name before importing from json files in git-import

* update the variable name

* changes per review

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-01-26 21:26:22 +05:30
Abhijeet
0183897d5a
chore: Update mongo indexes to improve the query performance (#10658)
* Add index for JScollection, action and userData

* Refactor
2022-01-26 21:24:56 +05:30
Abhijeet
231c3aaeb7
fix: Bugfix for curl import when the request is made from the child branch for git-connected application (#10638)
* Fix for curl import in sub-branch

* Added comment
2022-01-26 18:20:49 +05:30
Anagh Hegde
341bc61e8c
feat: Add logic to sync the repo if the path is not updated in env file (#10478)
* Add logic to sync the repo if the path is not updated in env file

* changes per review

* checkout branch locally when the branch is not present in remote

* Add the local checked out branch to list
2022-01-26 12:55:07 +05:30
Shrikant Sharat Kandula
6accb9e364
fix: Use CDN for all assets (#10417)
Co-authored-by: Nayan <nayan@appsmith.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2022-01-26 02:19:43 +05:30
Nayan
bb9010d875
fix: fetch user by case insensitive email for oauth login (#10350)
When an user signs up, we store the email in lower case. When user logins with oauth2, we fetch user by email ignoring case. This creates a problem if email from oauth is in upper case. As users are registered with lowercase and we're trying to fetch with upper, users are not found.
This PR fetches user by case insensitive emails during oauth login.
2022-01-25 13:54:50 +00:00
Nidhi
44f5e353fa
fix: Fix typo in default resources ids for actions within collections while creating new collection (#10349)
* fix: Small fix in default resources for actions within collections

* Added tests
2022-01-20 18:17:34 +00:00
Leo Thomas
58b376fa9b
fix: Fix 10463 js object cloning issue (#10523)
* fixes js object cloning issue

* fix10463- JSObject returning new name of cloned object

Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Leo Thomas <leoweb2010@gmail.com>
2022-01-20 22:02:11 +05:30
Rishabh Rathod
10e64df1e5
chore: S3 Template (#10461)
* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-01-20 14:07:05 +00:00
Abhijeet
62b720ab00
feat: Add documentation URL alongwith the error response to offer more info about the exception (#10325)
* Add doc url param in error response

* Modify TCs

* Update error codes to follow the sequence
2022-01-20 02:48:43 +00:00
Abhijeet
0ec6875b47
fix: Fix clone JSObject issue where cloned JSObject gets attached to both parent and cloned page and fix race condition for delete action when trying to delete page with JSObject (#10455)
* Fix clone JSObject issue where cloned JSObject gets attached to both parent and cloned page

* Race condition for delete action when trying to delete page with JSObject

* Set published collection to null during fork application
2022-01-19 17:06:27 +00:00
Abhijeet
a48aa9c72b
feat: Remove action and actionCollection ids in exported application JSON (#10430)
* Export action and actionCollection without actual ids

* Added TC

* Comments
2022-01-19 11:46:32 +05:30
Abhijeet
3471de90cd
fix: Gracefully handle defaultResourceIds exception (#10454)
* Gracefully handle defaultResourceIds exception

* Added TCs

* Remove sentry logs
2022-01-19 10:45:36 +05:30
Abhijeet
1ed1bf0e5d
feat: Apply JSON schema migration while importing the application using JSON file (#10339)
* Json schema version check added before importing an application

* Added TC

* Fieldname refactor to make it more relevant
2022-01-18 07:11:23 +00:00
Shrikant Sharat Kandula
f2d26db290
Use CDN for plugin icons (#10393)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-01-15 12:54:30 +05:30
Abhijeet
0b71b3840c
Fix error for import curl when app is connected to git (#10355) 2022-01-14 08:59:56 +05:30
Abhijeet
c1e2a1ed59
Revert "chore: Don't take client subscription into account for fork application (#10220)" (#10375)
This reverts commit 814a7d57f9.
2022-01-13 19:00:04 +05:30
Nayan
02be902fdc
feat: add page slug in the get pages API (#10345)
We've added slug for pages. Each page has a slug which is generated from name automatically. In our get pages API /api/v1/pages/application/<app_id>, the slug names were not included in the Page DTO. This PR adds slug name in this API response.
2022-01-13 17:29:09 +06:00
Anagh Hegde
f660c0696d
fix: Fix issue with current branch not deleted exeception (#10334) 2022-01-13 14:07:01 +05:30
Anagh Hegde
7718e03b76
fix: Change SSH key generation protocol for git (#10307)
* move away from RSA-SHA1 to ECDSA-SHA2 protocol for key generation

* Add migration to regenerate SSH keys via new protocol

* use 256 bit signature for the keys

* remove unused imports

* Fix error message for key generation
2022-01-12 12:05:35 +05:30
Sumit Kumar
7306967d0b
fix: fix page load action execution order (#10252)
* This PR fixes the page load action execution order when the actions have been set to run on page load explicitly via the settings tab by the user and its data has not been referenced in any other widget or action. e.g.
  - create action1 and action2.
  - make action2 dependent on action1 by adding {{action1.data}} in action2's body.
  - set both action1 and action2 to run on page load via settings tab. Do not reference action1 and action2 data in any other widget or action.
2022-01-11 16:13:54 +00:00
Shrikant Sharat Kandula
a0aa41145b
chore: Re-run the fakeapi DB migration (#10310) 2022-01-11 13:38:07 +00:00
Abhijeet
814a7d57f9
chore: Don't take client subscription into account for fork application (#10220) 2022-01-11 16:20:40 +05:30
Abhijeet
5f14dcc798
chore: Add migration to update indexes for DB collection to include branchName param for git enabled apps(#10295)
* Add migration to insert index to include branch param for newAction, newPage, application and actionCollection
2022-01-11 16:10:07 +05:30
Rishabh Rathod
034aadf835
fix: Update crud template (#10281) 2022-01-11 04:11:31 +05:30
Sumit Kumar
f045af8bfc
feat: Mongo plugin: add limit field to aggregate command to allow users to define batchSize (#10257)
* This PR adds a limit field which sets the batchSize for aggregate command. This way the user can set the number of documents they want in their Mongo query result.
* limit is set to 10 initially. However, for pre-existing Mongo actions, migration has been added to set this field to 101 - which is the default value that has been used by Mongodb in the absence of any user set value. Ref: https://docs.mongodb.com/manual/tutorial/iterate-a-cursor/
2022-01-10 16:42:30 +00:00
Rishabh Rathod
b4a5540b60
chore: Revert "Updated Template (#10146)" (#10248)
This reverts commit 28d05e29fc.
2022-01-10 13:23:50 +05:30
Anagh Hegde
2469d21c51
fix: ssh to http url conversion (#10173)
* fix ssh to http url conversion

* fix sync branch issue

* changes per review

* changes per review

* fix error message
2022-01-10 11:00:36 +05:30
Rishabh Rathod
28d05e29fc
Updated Template (#10146)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-01-07 10:12:14 +00:00
Abhijeet
92a5cbf7f2
chore: Don't take client cancellation for git flows into account to keep the repo and DB in sane state even when client cancels subscription (#10036)
* Added Mono sink calls for git and import application APIs

* TC for import-export

* Update TCs for gitService

* Added git commit and create branch test

* Test added for midway cancellation flow
2022-01-06 20:04:35 +05:30
Anagh Hegde
ed490304d9
feat: Git import - generate and save SSH Keys (#9129)
* Added API to generate deploy keys and store them in a collection for import flow

* Add tests for the key generation flow

* Move the key generation to helper class

* changes per review

* changes per review
2022-01-06 15:16:33 +05:30
Nayan
758d6d6725
fix: Fixed error due to string to instant serialization (#10074)
Fixes the serialization exception when exported application has deleted JSObject.

Fixes #9807
2022-01-06 11:13:25 +06:00
Anagh Hegde
48af7ea0df
fix: Merge and pull branch analytics NPE (#10117)
* Fix merge and pull branch issue

* fix detach remote API

* changes per review

* changes per review
2022-01-04 13:25:58 +05:30
Anagh Hegde
4718f519a3
fix: sync branch issues (#9918)
* Error handling for git limit

* clear cahe of git limit on connect api

* update per review

* check the repo is public before checking for the limit

* changes per review

* check if the repo is public or private during connect flow

* fix issues with sync branches

* Add sucess error handler

* changes per review

* add missing return statement

* remove unused import statements
2022-01-03 11:42:58 +05:30
Nayan
50fd155d2f
fix: Unable to add comment to public apps (#10103)
Commenting on a public app fails if the user is not not part of the corresponding organization. This PR fixes that issue.
2022-01-03 11:59:35 +06:00
Nayan
abd4de1cd9
fix: Application is not publishable when imported without theme (#10009)
When we import an application from a JSON file where themes are not present, publishing the application fails. This PR fixes this issue.
2021-12-30 12:32:54 +06:00
Abhijeet
9cba2986f3
fix: Fix npe while importing application when JSObject contains only variables and no action (#10044) 2021-12-29 15:48:04 +00:00
Abhijeet
d24703cdea
feat: Introduce version field for git JSON files structure (#9800)
* Introduce version field for applicationJson

* Update TC to check the version
2021-12-29 15:29:53 +05:30
Anagh Hegde
f921305e95
feat: Add analytics for BE git events (#9899)
* Add analytics for connect flow

* Add analytics for commit flow

* Add analytics events for git flows

* changes per review

* add reference to constructor

* Add error events to git analytics

* changes per review

* resolve conflicts
2021-12-29 07:23:03 +00:00
Abhijeet
3bf43dc73a
fix: Filter the action and collection with no pageIds to fix server error while importing the application (#10024)
* Filter the action and collection with no pageIds to fix npe

* Added TC
2021-12-29 04:59:47 +00:00
Abhijeet
4c5241bc93
fix: JS objects not getting copied over when app is duplicated while retaining the JS objects in original app (#10011)
* Create new action collection instead of updating the original collection 

* Update TC
2021-12-28 12:00:41 +00:00
Abhijeet
b72ac43bd7
fix: Update defaultResourceIds with resource ids after the disconnect event (#9990)
* Update defaultResourceIds with resource ids after the disconnect event

* Update TC to check the applicationPage updates correctly

* Added TC
2021-12-28 10:57:50 +05:30
Nidhi
3426d70b28
chore: Fixed dot replacement policy for mongo (#9961) 2021-12-25 21:29:05 +05:30
Abhijeet
904b05abaa
chore: Update git error codes to log only useful errors in sentry (#9994) 2021-12-25 09:55:01 +00:00
Nayan
e3f8040265
fix: Set auth db name in MongoDB properties (#9997) 2021-12-24 20:45:18 +05:30
Anagh Hegde
74f0d7400f
add tests and fix tests failures (#9981) 2021-12-24 14:54:47 +00:00
Nayan
cd3a2ac1c4
Set a default color to application when application has no color set from FE (#9919) 2021-12-24 15:51:42 +06:00
balajisoundar
1fad719dbe
Add API for application themes (#9449) 2021-12-24 12:14:59 +05:30
Nidhi
9af1f4c9f4
fix: Switched reference from package name to plugin name (#9916) 2021-12-23 14:16:30 +00:00
Nidhi
b2855ccf77
fix: Do not return JS actions when fetching page actions (#9960) 2021-12-23 14:16:16 +00:00
Sumit Kumar
4a075628d7
fix: add work around to handle bad data in Firestore UQI migration (#9966)
* add another migration for those Firestore actions that could not be migrated.
* handle ClassCastException via try catch and assigning default empty value.
2021-12-23 15:59:53 +05:30
Abhijeet
0e0b4d0d1e
Check for layoutOnLoadAction during clone application (#9947) 2021-12-22 21:40:19 +05:30
Anagh Hegde
4f4d0fd7df
fix: Clear the cache - git limit number of repos (#9874)
* Error handling for git limit

* clear cahe of git limit on connect api

* update per review

* check the repo is public before checking for the limit

* changes per review

* check if the repo is public or private during connect flow
2021-12-21 14:17:26 +00:00
Nikhil Nandagopal
0b0b978245
chore: Updated Template for CRUD DB template (#9913) 2021-12-21 19:34:37 +05:30
Shrikant Sharat Kandula
2dec964e21
Add migration for new MongoDB mock endpoint (#9909)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-21 18:04:12 +05:30
Abhijeet
20649ccb0a
fix: Fixes issues related to git profile and use appsmith user profile as a fallback value (#9891)
* Fixes related to git profile

* Added a TC for connect application with empty git profile and null default git profile
2021-12-21 16:45:56 +05:30
Sumit Kumar
b8cfc18f7f
fix: fix firestore pagination cyclic dependency error (#9892)
* fix firestore pagination cyclic dependency error
fix firestore UQI migration error

* fix TC
2021-12-21 11:27:05 +05:30
Abhijeet
95869517f6
fix: Replace default IDs for forked application with destination resource IDs (#9886) 2021-12-21 11:19:00 +05:30
Nayan
a447c6ee5d
Hide updated date when application was not updated manually (#9493)
We should last updated date of an application in the home page. If an application was updated internally e.g. a new user was added to the application, the updated date was set and it was displayed in the home page. This PR fixes that problem.
2021-12-20 22:54:02 +00:00
Anagh Hegde
8a75928c2f
fix: Fix the wrong CS url for private repo limit check (#9865) 2021-12-20 15:16:57 +05:30
arunvjn
99a12be018
feat: add option to delete org (#9287)
Co-authored-by: Nayan <nayan@appsmith.com>
2021-12-20 05:58:01 +00:00
Anagh Hegde
1b30c58617
feat: Limit private git repos which can be connected within organization (#9803)
* Added check for private repos

* WIP limit repos

* Get the git connected apps from git

* Call CS to get the limit for the git connected apps

* Update comment

* Changes per review

* Add check for limiting the repo

* Cache the results from cloud service

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2021-12-18 17:40:46 +00:00
Abhijeet
5e6e6caedb
fix: Use Appsmith user profile as a fallback git profile (#9821)
* Added appsmith profile as a fallback value

* Modified TC for userData to include git profile TCs

* Added check for null value when user want to use repo level profile and provide empty author name or email

* Refactor method names
2021-12-18 21:36:25 +05:30
Nayan
68a9584fd9
fix: removed sentry reposrting when application not found (#9839) 2021-12-17 20:16:49 +05:30
Nidhi
ab4add4b83
fix: Install plugin to existing organizations after approval (#9840) 2021-12-17 12:35:19 +05:30
Shrikant Sharat Kandula
8a336d3caa Fix OOM in insertDefaultResources migration
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-16 22:39:48 +05:30
Shrikant Sharat Kandula
1247864893
Fix migration OOM in firestore action migration (#9830)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-16 21:03:35 +05:30
balajisoundar
3c1edbeb3a
feat: Admin settings page to tinker with env variables (#9687) 2021-12-16 19:47:16 +05:30
Nidhi
508865f1dc
fix: Added handling for refactor of default list elements (#9774) 2021-12-16 11:33:40 +00:00
Abhijeet
52782c6088
fix: Resolve issues related to disconnect git repo flow (#9760)
* Fixed issues related to git disconnect

* Update TC
2021-12-16 08:50:11 +00:00
Abhijeet
c51c0036af
fix: Fix action collection not being deleted when the deleted collection in edit mode is published (#9785) 2021-12-16 13:48:14 +05:30
Sumit Kumar
7909ae8680
feat: port Firestore plugin to UQI (#9393)
* Port Firestore plugin to UQI schema
* This PR implements a non-functional requirement i.e. from an end user perspective there is no change in the features that the plugin provides. However, the underlying DSL to render and interpret the query interface has been updated.
* It also involves a migration change to port existing Firestore plugin actions to the new UQI schema.
2021-12-16 13:31:09 +05:30
Nidhi
8d53c16e25
fix: Added check for self references in layout (#9756) 2021-12-16 13:30:19 +05:30
Trisha Anand
11603e0d24
chore: Backend code split (#9610)
* Server comes up

* Instead of extracting ee, we extract the ce to get the mongo repo to work

* ActionRepo migrated

* ApiTemplateRepo migrated

* Application repo migrated

* Asset Repo migrated

* Collection repo migrated

* Comment repo migrated

* Comment thread repo migrated

* Config repo migrated

* datasource repo migrated

* group repo migrated

* Invite user repo migrated

* layout repo migrated

* New action repo migratd

* .

* Migrated rest of the repos.

* Migrated the repo impl as well between ce and common

* acl package partially migrated

* Authentication migration done!

* Controllers migrated

* AppsmithPermission enum migrated to class and split

* Unnecessary change removed

* Appsmith role enum converted to class

* Revert

* Reverting enum to class conversion after failing at implementing

* All services migrated

* server.solutions package completed

* Fixed solutions failing test cases

* Code compiling! Woohoo!
2021-12-15 22:59:46 +05:30