Skip to content

Commit

Permalink
Merge branch 'feat/improve_left_when_click_on_view' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AruSeito committed Oct 30, 2023
2 parents 3e6ca4a + 10696c6 commit f329281
Show file tree
Hide file tree
Showing 25 changed files with 116 additions and 88 deletions.
2 changes: 1 addition & 1 deletion apps/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"author": "ILLA Cloud <[email protected]>",
"license": "Apache-2.0",
"version": "3.2.3",
"version": "3.2.4",
"scripts": {
"dev": "vite --strictPort --force",
"build-cloud": "NODE_OPTIONS=--max-old-space-size=12288 vite build --mode cloud",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import {
getCurrentPageRightWidgetTree,
} from "@/redux/currentApp/executionTree/executionSelector"
import { executionActions } from "@/redux/currentApp/executionTree/executionSlice"
import { autoChangeContainersIndexWhenClick } from "@/utils/componentNode/search"
import {
autoChangeContainersIndexWhenClick,
autoChangeWhenClickOnCanvas,
} from "@/utils/componentNode/search"
import { FocusManager } from "@/utils/focusManager"
import { BaseDataItem } from "../BaseDataItem"

Expand All @@ -32,7 +35,10 @@ export const ComponentSpaceTree: FC = () => {

const handleClick = useCallback(
(displayName: string, type: string) => {
if (!type.endsWith("_WIDGET")) return
console.log("type", type)
if (type === "CANVAS") {
displayName = autoChangeWhenClickOnCanvas(displayName)
}
if (type === "MODAL_WIDGET") {
dispatch(
executionActions.updateModalDisplayReducer({
Expand All @@ -47,7 +53,7 @@ export const ComponentSpaceTree: FC = () => {
const dom = document.querySelector(
`[data-displayname="${displayName}"]`,
)
dom?.scrollIntoView({ behavior: "smooth" })
dom?.scrollIntoView({ behavior: "smooth", block: "center" })
}, 160)
},
[dispatch],
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import {
ILLA_MIXPANEL_EVENT_TYPE,
MixpanelTrackContext,
} from "@illa-public/mixpanel-utils"
import { getResourceNameFromResourceType } from "@illa-public/resource-generator"
import {
ResourceTypeSelector,
getResourceNameFromResourceType,
} from "@illa-public/resource-generator"
import { FC, useCallback, useContext, useEffect, useState } from "react"
import { useTranslation } from "react-i18next"
import { useDispatch, useSelector } from "react-redux"
Expand All @@ -30,7 +33,6 @@ import { getResourceTypeFromActionType } from "@/utils/actionResourceTransformer
import { DisplayNameGenerator } from "@/utils/generators/generateDisplayName"
import { INIT_ACTION_ADVANCED_CONFIG } from "../AdvancedPanel/constant"
import { ResourceCreator } from "../ResourceGenerator/ResourceCreator"
import { ActionTypeSelector } from "./ActionTypeSelector"
import { ActionCreatorPage, ActionGeneratorProps } from "./interface"
import { modalContentStyle } from "./style"

Expand Down Expand Up @@ -319,7 +321,7 @@ export const ActionGenerator: FC<ActionGeneratorProps> = function (props) {
>
<div css={modalContentStyle}>
{currentStep === "select" && (
<ActionTypeSelector onSelect={handleActionTypeSelect} />
<ResourceTypeSelector onSelect={handleActionTypeSelect} />
)}
{currentStep === "createAction" &&
currentActionType &&
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { isCloudVersion } from "@illa-public/utils"
import { FC, lazy } from "react"
import { useNavigate } from "react-router-dom"
import { ConfigElementProps } from "./interface"

const AirtableConfigElement = lazy(
Expand Down Expand Up @@ -131,6 +133,8 @@ const SnowflakeConfigElement = lazy(
export const ConfigElement: FC<ConfigElementProps> = (props) => {
const { resourceType } = props

const navigate = useNavigate()

switch (resourceType) {
case "supabasedb":
case "tidb":
Expand All @@ -144,8 +148,15 @@ export const ConfigElement: FC<ConfigElementProps> = (props) => {
case "mssql":
return <MicrosoftSqlConfigElement {...props} />
case "oracle":
case "oracle9i":
return <OracleDBConfigElement {...props} resourceType={resourceType} />
case "oracle9i": {
if (isCloudVersion) {
return <OracleDBConfigElement {...props} resourceType={resourceType} />
} else {
navigate("/404")
return null
}
}
case "restapi":
return <RestApiConfigElement {...props} />
case "mongodb":
Expand Down
20 changes: 20 additions & 0 deletions apps/builder/src/utils/componentNode/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,23 @@ export const autoChangeContainersIndexWhenClick = (

return canvasForeFatherDisplayNames
}

export const autoChangeWhenClickOnCanvas = (canvasDisplayName: string) => {
const rootState = store.getState()
const widgetsLayoutInfo = getExecutionWidgetLayoutInfo(rootState)
const parentContainerDisplayName =
widgetsLayoutInfo[canvasDisplayName]?.parentNode
const indexOfCanvas =
widgetsLayoutInfo[parentContainerDisplayName]?.childrenNode.indexOf(
canvasDisplayName,
)
store.dispatch(
executionActions.updateExecutionByMultiDisplayNameReducer([
{
displayName: parentContainerDisplayName,
value: { currentIndex: indexOfCanvas },
},
]),
)
return parentContainerDisplayName
}
3 changes: 3 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/AnagramGenerator.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Anagram Generator
Unlock the magic of words with our Anagram Generator Agent – creating endless anagrams for your delight. Play with language today!
Fast try: https://illa.ai/ai-agent/ILAfx4p1C7rF/detail
5 changes: 5 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/AntonymFinder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Antonym Finder

This AI Agent gives the antonym of the user input word.

Fast try: https://illa.ai/ai-agent/ILAfx4p1C7uy/detail
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Language Learning Roadmap
Create a customized plan to enhance your language learning journey by setting specific goals and identifying resources.
Fast try: https://illa.ai/ai-agent/ILAfx4p1C7vt/detail
3 changes: 3 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/MinecraftAssistant.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Minecraft Helper
The Minecraft Helper AI is an advanced artificial intelligence designed to enhance the gaming experience of Minecraft players.
Fast try: https://illa.ai/ai-agent/ILAfx4p1C7rB/detail
3 changes: 3 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/Osiris.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## GitHub Education Pack Bot
It answers all questions about the github education pack.
Fast try : https://illa.ai/ai-agent/ILAfx4p1C7ts/detail
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Password Strength Checker
A Password Strength Checker is a tool that assesses the strength of a password by evaluating various factors like length, character variety, uniqueness, etc.
Try Now: https://illa.ai/ai-agent/ILAfx4p1C7se/detail
6 changes: 6 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/StorySpark.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Story Spark
A virtual Storyteller for 3 - 6 year old kids providing personalised stories.

Input : {name} , {gender}, {story theme}

Fast try: https://illa.ai/ai-agent/ILAex4p1C7Tz/detail
3 changes: 3 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/TimeTravelerTom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# TimeTravelerTom
Meet TimeTravelerTom, your historical figure chatbot. Interact with past icons, ask questions, and explore history's gems!
Fast try: https://illa.ai/ai-agent/ILAfx4p1C7rQ/detail
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# User behavior analysis report
This prompt describes a report that analyzes user interactions and behaviors within a product or system.
Fast try: https://illa.ai/ai-agent/ILAfx4p1C7vr/detail
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# All Things Counter Strike

An AI chatbot to fine-tuned to answer questions related to Counter Strike, the epic video game entertaining us all for over 20 years now.

Users can ask questions related to counter strike in general and also ask the bot to summarize professional counter strike matches.

Try it: https://illa.ai/ai-agent/ILAfx4p1C7r2/detail
5 changes: 5 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/snooker-summarizer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Snooker Summarizer

This agent provides summaries of professional snooker matches. For example, type "Ronnie O'Sullivan vs Mark Williams most recent match" in the prompt.

Try it: https://illa.ai/ai-agent/ILAfx4p1C7rP/detail
3 changes: 3 additions & 0 deletions hacktoberfest2023/awesome-ai-agents/the_matrix_quotes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The Matrix Quotes
Generate personalized quotes from the Matrix movies.
Fast try: https://illa.ai/ai-agent/ILAfx4p1C7qk/detail
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Hacktoberfest Treasure Hunt #hacktoberfesttreasurehunt
Fast try: https://illa.ai/app/ILAfx4p1C7Mf/detail
3 changes: 3 additions & 0 deletions hacktoberfest2023/awesome-illa-apps/Hex-RGB-Converter
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Hex to RGB Converter
Convert HEX to RGB
Fast try: https://builder.illacloud.com/a3385d2894263c3a0ff9b1505b2982ed/deploy/app/ILAfx4p1C72F
2 changes: 1 addition & 1 deletion hacktoberfest2023/awesome-illa-apps/Joker.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Joker
Provide you with daily dose of jokes! Check it: https://illa.ai/app/ILAfx4p1C72A/detail
A fun Jokes Generator. Provide you with daily dose of jokes! Check it: https://illa.ai/app/ILAfx4p1C72A/detail
15 changes: 15 additions & 0 deletions hacktoberfest2023/awesome-illa-apps/ProgrammingMemeGenerator.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Programming Memes Generator
Introducing Programming Memes Generator! Powered by ILLA Builder, it creates hilarious tech memes with a single click. Laugh, share, and enjoy the coding humor effortlessly! 🚀😂

### What have been used to make it?
We have used this [API](https://rapidapi.com/kaushalsharma880-GAglnDIvTy/api/programming-memes-images/) to build this application.

### How to Use?
Click on the Generate button and it will generate funny programming meme for you.

### Why Programming Memes Generator?
Because every programmer loves to visualize memes related to coding and tech to have fun!

Thank you for choosing Programming Memes Generator. Where programming meets the world of memes and fun.

Check it out here : [Programming Memes Generator](https://illa.ai/app/ILAfx4p1C7I2/detail)
2 changes: 1 addition & 1 deletion packages/illa-public-component

0 comments on commit f329281

Please sign in to comment.