diff --git a/frontend/src/Editor/EditorFunc.jsx b/frontend/src/Editor/EditorFunc.jsx
index b9781d3dc6..2276127fee 100644
--- a/frontend/src/Editor/EditorFunc.jsx
+++ b/frontend/src/Editor/EditorFunc.jsx
@@ -1472,7 +1472,6 @@ const EditorComponent = (props) => {
appDefinition={_.cloneDeep(appDefinition)}
toggleAppMaintenance={toggleAppMaintenance}
editingVersion={editingVersion}
- app={app}
appVersionPreviewLink={appVersionPreviewLink}
canUndo={canUndo}
canRedo={canRedo}
diff --git a/frontend/src/Editor/Header/index.js b/frontend/src/Editor/Header/index.js
index 5fdcf86bf9..e788c039e8 100644
--- a/frontend/src/Editor/Header/index.js
+++ b/frontend/src/Editor/Header/index.js
@@ -18,7 +18,6 @@ import SolidIcon from '@/_ui/Icon/SolidIcons';
export default function EditorHeader({
M,
- app,
appVersionPreviewLink,
canUndo,
canRedo,
@@ -31,15 +30,13 @@ export default function EditorHeader({
saveEditingVersion,
onVersionDelete,
isMaintenanceOn,
- appName,
- appId,
slug,
darkMode,
}) {
const currentUser = useCurrentUser();
const { updateState } = useAppDataActions();
- const { isSaving } = useAppInfo();
+ const { isSaving, appId, appName, app, currentVersionId, isPublic } = useAppInfo();
const handleSlugChange = (newSlug) => {
updateState({ slug: newSlug });
@@ -99,7 +96,7 @@ export default function EditorHeader({
}}
>
-
+
@@ -136,9 +133,10 @@ export default function EditorHeader({
{editingVersion && (
)}
@@ -150,9 +148,10 @@ export default function EditorHeader({
>
- {app.id && (
+ {appId && (
{
sideBarBtnRefs.current[page] = ref;
};
- console.log('-----arpit::::: [gs]', { appDefinition });
-
const SELECTED_ITEMS = {
page: (
{
+ fetchAppUsers = (appId) => {
+ console.log('---arpit [manager users]:; ', { x: this.props });
appService
- .getAppUsers(this.props.app.id)
+ .getAppUsers(appId)
.then((data) =>
this.setState({
users: data.users,
@@ -64,11 +66,11 @@ class ManageAppUsersComponent extends React.Component {
const { organizationUserId, role } = this.state.newUser;
appService
- .createAppUser(this.state.app.id, organizationUserId, role)
+ .createAppUser(this.state.appId, organizationUserId, role)
.then(() => {
this.setState({ addingUser: false, newUser: {} });
toast.success('Added user successfully');
- this.fetchAppUsers();
+ this.fetchAppUsers(this.state.appId);
})
.catch(({ error }) => {
this.setState({ addingUser: false });
@@ -77,14 +79,14 @@ class ManageAppUsersComponent extends React.Component {
};
toggleAppVisibility = () => {
- const newState = !this.state.app.is_public;
+ const newState = !this.state.isPublic;
this.setState({
ischangingVisibility: true,
});
// eslint-disable-next-line no-unused-vars
appService
- .setVisibility(this.state.app.id, newState)
+ .setVisibility(this.state.appId, newState)
.then(() => {
this.setState({
ischangingVisibility: false,
@@ -109,11 +111,11 @@ class ManageAppUsersComponent extends React.Component {
};
handleSetSlug = (event) => {
- const newSlug = event.target.value || this.props.app.id;
+ const newSlug = event.target.value || this.props.appId;
this.setState({ isSlugVerificationInProgress: true });
appService
- .setSlug(this.state.app.id, newSlug)
+ .setSlug(this.state.appId, newSlug)
.then(() => {
this.setState({
slugError: null,
@@ -134,8 +136,8 @@ class ManageAppUsersComponent extends React.Component {
}, 500);
render() {
- const { isLoading, app, slugError, isSlugVerificationInProgress } = this.state;
- const appId = app.id;
+ const { isLoading, app, slugError, isSlugVerificationInProgress, appId } = this.state;
+
const appLink = `${window.public_config?.TOOLJET_HOST}${getSubpath() ? getSubpath() : ''}/applications/`;
const shareableLink = appLink + (this.props.slug || appId);
const slugButtonClass = isSlugVerificationInProgress ? '' : slugError !== null ? 'is-invalid' : 'is-valid';
@@ -176,7 +178,7 @@ class ManageAppUsersComponent extends React.Component {
className="form-check-input color-slate12"
type="checkbox"
onClick={this.toggleAppVisibility}
- checked={this.state.app.is_public}
+ checked={this.state.isPublic}
disabled={this.state.ischangingVisibility}
data-cy="make-public-app-toggle"
/>
@@ -223,7 +225,7 @@ class ManageAppUsersComponent extends React.Component {
- {(this.state.app.is_public || window?.public_config?.ENABLE_PRIVATE_APP_EMBED === 'true') && (
+ {(this.state.isPublic || window?.public_config?.ENABLE_PRIVATE_APP_EMBED === 'true') && (