Merge branch 'feat/app' into develop

illacloud · Jul 7, 2023 · c971f0c · c971f0c
2 parents c5d33a6 + 471038c
commit c971f0c
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 861 deletions.
diff --git a/apps/builder/src/config/guide/data.json b/apps/builder/src/config/guide/data.json
@@ -3,7 +3,7 @@
  "appId": "ILAex4p1C72V",
  "uid": "00000000-0000-0000-0000-000000000000",
  "teamID": "ILAfx4p1C7d0",
- "appName": "Example",
+ "appName": "Onboarding",
  "releaseVersion": 0,
  "mainlineVersion": 0,
  "config": {

diff --git a/apps/builder/src/page/App/components/PageNavBar/index.tsx b/apps/builder/src/page/App/components/PageNavBar/index.tsx
@@ -32,7 +32,6 @@ import { UpgradeIcon } from "@/illa-public-component/Icon/upgrade"
 import { ILLA_MIXPANEL_EVENT_TYPE } from "@/illa-public-component/MixpanelUtils/interface"
 import { UpgradeCloudContext } from "@/illa-public-component/UpgradeCloudProvider"
 import { canUseUpgradeFeature } from "@/illa-public-component/UserRoleUtils"
-import { ForkAndDeployModal } from "@/page/App/components/ForkAndDeployModal"
 import { AppName } from "@/page/App/components/PageNavBar/AppName"
 import { AppSizeButtonGroup } from "@/page/App/components/PageNavBar/AppSizeButtonGroup"
 import { CollaboratorsList } from "@/page/App/components/PageNavBar/CollaboratorsList"
@@ -96,7 +95,6 @@ export const PageNavBar: FC<PageNavBarProps> = (props) => {
  const teamInfo = useSelector(getCurrentTeamInfo)
  const { handleUpgradeModalVisible } = useContext(UpgradeCloudContext)
 
- const [forkModalVisible, setForkModalVisible] = useState(false)
  const [deployLoading, setDeployLoading] = useState<boolean>(false)
  const [duplicateLoading, setDuplicateLoading] = useState(false)
 
@@ -154,30 +152,30 @@ export const PageNavBar: FC<PageNavBarProps> = (props) => {
 
  const forkGuideAppAndDeploy = useCallback(
  async (appName: string) => {
- if (appName === undefined || appName === "" || appName?.trim() === "") {
- message.error({
- content: t("dashboard.app.name_empty"),
- })
- return
- }
  setDeployLoading(true)
  const appId = await forkCurrentApp(appName)
- setForkModalVisible(false)
  deployApp(appId, false)
  },
- [deployApp, message, t],
+ [deployApp],
  )
 
  const handleClickDeploy = useCallback(() => {
  if (isGuideMode) {
- setForkModalVisible(true)
+ forkGuideAppAndDeploy(appInfo.appName)
  } else {
  trackInEditor(ILLA_MIXPANEL_EVENT_TYPE.CLICK, {
  element: "deploy",
  })
- deployApp(appInfo.appId, appInfo.config.public)
+ deployApp(appInfo.appId, appInfo.config?.public)
  }
- }, [appInfo.appId, appInfo.config.public, isGuideMode, deployApp])
+ }, [
+ appInfo.appId,
+ appInfo.config?.public,
+ appInfo.appName,
+ isGuideMode,
+ deployApp,
+ forkGuideAppAndDeploy,
+ ])
 
  const handleClickDeployMenu = useCallback(
  (key: string | number) => {
@@ -387,12 +385,6 @@ export const PageNavBar: FC<PageNavBarProps> = (props) => {
  <>{PreviewButton}</>
  )}
  </div>
- <ForkAndDeployModal
- visible={forkModalVisible}
- okLoading={deployLoading}
- onOk={forkGuideAppAndDeploy}
- onVisibleChange={setForkModalVisible}
- />
  </div>
  )
 }

diff --git a/apps/builder/src/page/Dashboard/DashboardApps/AppCardActionItem/index.tsx b/apps/builder/src/page/Dashboard/DashboardApps/AppCardActionItem/index.tsx
@@ -373,7 +373,11 @@ export const AppCardActionItem: FC<AppCardActionItemProps> = (props) => {
  </DropList>
  }
  >
- <Button colorScheme="grayBlue" leftIcon={<MoreIcon size="14px" />} />
+ <Button
+ variant="text"
+ colorScheme="grayBlue"
+ leftIcon={<MoreIcon size="14px" />}
+ />
  </Dropdown>
  ) : null}
  <MixpanelTrackProvider

diff --git a/apps/builder/src/page/Dashboard/DashboardApps/contentBody.tsx b/apps/builder/src/page/Dashboard/DashboardApps/contentBody.tsx
@@ -150,7 +150,6 @@ export const AppsContentBody: FC<AppsContentBodyProps> = (props) => {
  <div>{t("new_dashboard.desc.blank")}</div>
  <div>
  <Button
- variant="text"
  colorScheme="grayBlue"
  loading={loading}
  leftIcon={<PlusIcon size="10px" />}