Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions app/client/src/ce/entities/FeatureFlag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export const FEATURE_FLAG = {
"config_mask_session_recordings_enabled",
config_user_session_recordings_enabled:
"config_user_session_recordings_enabled",
release_ads_entity_item_enabled: "release_ads_entity_item_enabled",
release_external_saas_plugins_enabled:
"release_external_saas_plugins_enabled",
release_tablev2_infinitescroll_enabled:
Expand Down Expand Up @@ -96,7 +95,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
kill_session_recordings_enabled: false,
config_user_session_recordings_enabled: true,
config_mask_session_recordings_enabled: true,
release_ads_entity_item_enabled: false,
release_external_saas_plugins_enabled: false,
release_tablev2_infinitescroll_enabled: false,
release_table_custom_sort_function_enabled: false,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

77 changes: 12 additions & 65 deletions app/client/src/pages/AppIDE/components/JSExplorer/JSSegmentList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,18 @@ import React, { useState } from "react";
import { useSelector } from "react-redux";
import {
Flex,
Text,
SearchAndAdd,
NoSearchResults,
EntityGroupsList,
} from "@appsmith/ads";
import styled from "styled-components";

import { selectJSSegmentEditorList } from "ee/selectors/appIDESelectors";
import { useActiveActionBaseId } from "ee/pages/Editor/Explorer/hooks";
import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
import { ActionParentEntityType } from "ee/entities/Engine/actionHelpers";
import { FilesContextProvider } from "pages/Editor/Explorer/Files/FilesContextProvider";
import { useJSAdd } from "../JSAdd";
import { JSListItem } from "ee/pages/AppIDE/components/JSListItem/old/ListItem";
import { BlankState } from "./BlankState";
import { EDITOR_PANE_TEXTS, createMessage } from "ee/constants/messages";
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 { JSEntity } from "ee/pages/AppIDE/components/JSListItem/ListItem";
import type { EntityItem } from "ee/IDE/Interfaces/EntityItem";
import { getPagePermissions } from "selectors/editorSelectors";
Expand All @@ -38,22 +29,14 @@ const JSContainer = styled(Flex)`
export const ListJSObjects = () => {
const [searchTerm, setSearchTerm] = useState("");
const itemGroups = useSelector(selectJSSegmentEditorList);
const activeActionBaseId = useActiveActionBaseId();

const location = useLocation();
const ideType = getIDETypeByUrl(location.pathname);
const { editorId, parentEntityId } = useParentEntityInfo(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,
);

const filteredItemGroups = filterEntityGroupsBySearchTerm(
searchTerm,
itemGroups,
Expand Down Expand Up @@ -86,54 +69,18 @@ export const ListJSObjects = () => {
gap="spaces-3"
overflowY="auto"
>
{isNewADSTemplatesEnabled ? (
<EntityGroupsList
groups={filteredItemGroups.map(({ group, items }) => {
return {
groupTitle: group === "NA" ? "" : group,
items: items,
className: "",
renderList: (item: EntityItem) => {
return <JSEntity item={item} />;
},
};
})}
/>
) : (
filteredItemGroups.map(({ group, items }) => {
return (
<Flex flexDirection={"column"} key={group}>
{group !== "NA" ? (
<Flex py="spaces-1">
<Text
className="overflow-hidden overflow-ellipsis whitespace-nowrap"
kind="body-s"
>
{group}
</Text>
</Flex>
) : null}
<FilesContextProvider
canCreateActions={canCreateActions}
editorId={editorId}
parentEntityId={parentEntityId}
parentEntityType={ActionParentEntityType.PAGE}
>
{items.map((item) => {
return (
<JSListItem
isActive={item.key === activeActionBaseId}
item={item}
key={item.key}
parentEntityId={parentEntityId}
/>
);
})}
</FilesContextProvider>
</Flex>
);
})
)}
<EntityGroupsList
groups={filteredItemGroups.map(({ group, items }) => {
return {
groupTitle: group === "NA" ? "" : group,
items: items,
className: "",
renderList: (item: EntityItem) => {
return <JSEntity item={item} />;
},
};
})}
/>
{filteredItemGroups.length === 0 && searchTerm !== "" ? (
<NoSearchResults
text={createMessage(
Expand Down
Loading
Loading