diff --git a/app/client/src/ce/entities/IDE/hooks/useCreateActionsPermissions.ts b/app/client/src/ce/entities/IDE/hooks/useCreateActionsPermissions.ts deleted file mode 100644 index 25af291d792d..000000000000 --- a/app/client/src/ce/entities/IDE/hooks/useCreateActionsPermissions.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; -import { IDE_TYPE, type IDEType } from "ee/IDE/Interfaces/IDETypes"; -import { FEATURE_FLAG } from "ee/entities/FeatureFlag"; -import { useSelector } from "react-redux"; -import { getPagePermissions } from "selectors/editorSelectors"; -import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers"; - -export const useCreateActionsPermissions = (ideType: IDEType) => { - const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled); - const pagePermissions = useSelector(getPagePermissions); - - switch (ideType) { - case IDE_TYPE.App: { - return getHasCreateActionPermission(isFeatureEnabled, pagePermissions); - } - default: { - return true; - } - } -}; diff --git a/app/client/src/ee/entities/IDE/hooks/useCreateActionsPermissions.ts b/app/client/src/ee/entities/IDE/hooks/useCreateActionsPermissions.ts deleted file mode 100644 index 87326ae22985..000000000000 --- a/app/client/src/ee/entities/IDE/hooks/useCreateActionsPermissions.ts +++ /dev/null @@ -1 +0,0 @@ -export { useCreateActionsPermissions } from "ce/entities/IDE/hooks/useCreateActionsPermissions"; diff --git a/app/client/src/pages/AppIDE/components/JSExplorer/JSSegmentList.tsx b/app/client/src/pages/AppIDE/components/JSExplorer/JSSegmentList.tsx index 7b6302565f06..791e6157cd3f 100644 --- a/app/client/src/pages/AppIDE/components/JSExplorer/JSSegmentList.tsx +++ b/app/client/src/pages/AppIDE/components/JSExplorer/JSSegmentList.tsx @@ -23,9 +23,10 @@ import { filterEntityGroupsBySearchTerm } from "IDE/utils"; import { useLocation } from "react-router"; import { getIDETypeByUrl } from "ee/entities/IDE/utils"; import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo"; -import { useCreateActionsPermissions } from "ee/entities/IDE/hooks/useCreateActionsPermissions"; import { JSEntity } from "ee/pages/AppIDE/components/JSListItem/ListItem"; import type { EntityItem } from "ee/IDE/Interfaces/EntityItem"; +import { getPagePermissions } from "selectors/editorSelectors"; +import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers"; const JSContainer = styled(Flex)` & .t--entity-item { @@ -42,7 +43,12 @@ export const ListJSObjects = () => { const location = useLocation(); const ideType = getIDETypeByUrl(location.pathname); const { editorId, parentEntityId } = useParentEntityInfo(ideType); - const canCreateActions = useCreateActionsPermissions(ideType); + const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled); + const pagePermissions = useSelector(getPagePermissions); + const canCreateActions = getHasCreateActionPermission( + isFeatureEnabled, + pagePermissions, + ); const isNewADSTemplatesEnabled = useFeatureFlag( FEATURE_FLAG.release_ads_entity_item_enabled, diff --git a/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx b/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx index f1b4209556ce..bd8bc121ab12 100644 --- a/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx +++ b/app/client/src/pages/AppIDE/components/QueryExplorer/QuerySegmentList.tsx @@ -24,9 +24,10 @@ import { ActionEntityItem } from "ee/pages/AppIDE/components/QueryEntityItem/Lis import { useLocation } from "react-router"; import { getIDETypeByUrl } from "ee/entities/IDE/utils"; import { useParentEntityInfo } from "ee/IDE/hooks/useParentEntityInfo"; -import { useCreateActionsPermissions } from "ee/entities/IDE/hooks/useCreateActionsPermissions"; import { objectKeys } from "@appsmith/utils"; import type { EntityItem } from "ee/IDE/Interfaces/EntityItem"; +import { getPagePermissions } from "selectors/editorSelectors"; +import { getHasCreateActionPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers"; export const ListQuery = () => { const [searchTerm, setSearchTerm] = useState(""); @@ -36,7 +37,12 @@ export const ListQuery = () => { const location = useLocation(); const ideType = getIDETypeByUrl(location.pathname); const { editorId, parentEntityId } = useParentEntityInfo(ideType); - const canCreateActions = useCreateActionsPermissions(ideType); + const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled); + const pagePermissions = useSelector(getPagePermissions); + const canCreateActions = getHasCreateActionPermission( + isFeatureEnabled, + pagePermissions, + ); const showWorkflows = useSelector(getShowWorkflowFeature);