Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed group creation #1365

Merged
merged 4 commits into from
Jun 24, 2024
Merged

fix: fixed group creation #1365

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f0cb9b
fix: fixed group creation
mishramonalisha76 Jun 24, 2024
efeaabe
fix: fixed the example file
mishramonalisha76 Jun 24, 2024
e1db1ea
fix: fixed build
mishramonalisha76 Jun 24, 2024
da1e2f7
fix: reverted restapi change
mishramonalisha76 Jun 24, 2024
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
13 changes: 11 additions & 2 deletions packages/examples/sdk-frontend-react/src/app/ChatUITest/ChatViewComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import styled from 'styled-components';

import { ChatView, MODAL_BACKGROUND_TYPE } from '@pushprotocol/uiweb';
import {
ChatView,
CreateGroupModal,
MODAL_BACKGROUND_TYPE,
} from '@pushprotocol/uiweb';
import { Section } from '../components/StyledComponents';
import Img from '../../assets/epnsLogo.png';
import { CHAT_ID } from '../constants';
Expand All @@ -17,7 +21,12 @@ const ChatViewComponentTest = () => {

<ChatViewComponentCard>
{/* uncomment the below code to test create group modal */}
{/* <CreateGroupModal onClose={()=>{console.log('in close')}} modalBackground={MODAL_BACKGROUND_TYPE.OVERLAY} modalPositionType={MODAL_POSITION_TYPE.RELATIVE}/> */}
<CreateGroupModal
onClose={() => {
console.log('in close');
}}
modalBackground={MODAL_BACKGROUND_TYPE.OVERLAY}
/>
<ChatView
onVerificationFail={() => console.log('Verification Failed')}
chatId={CHAT_ID}
Expand Down
104 changes: 42 additions & 62 deletions packages/uiweb/src/lib/hooks/chat/useCriteriaState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,54 @@
import { useState } from 'react';
import {
Condition,
ConditionType,
CriteriaStateType,
Rule,
TokenGatedRule,
} from '../../components/chat/types';
import { Condition, ConditionType, CriteriaStateType, Rule, TokenGatedRule } from '../../components/chat/types';
import { OPERATOR_OPTIONS } from '../../components/chat/constants';

export const useCriteriaState = (
defaultRules: Rule[][],
defaultConditionTypes: ConditionType[]
): CriteriaStateType => {
export const useCriteriaState = (defaultRules: Rule[][], defaultConditionTypes: ConditionType[]): CriteriaStateType => {
const [entryRootCondition, setEntryRootCondition] = useState<ConditionType>(
OPERATOR_OPTIONS[1]?.value as ConditionType
);
const [entryRuleTypeCondition, setEntryRuleTypeCondition] =
useState<ConditionType>(OPERATOR_OPTIONS[1]?.value as ConditionType);
const [entryOptionTypeArray, setEntryOptionTypeArray] = useState<
ConditionType[]
>(defaultConditionTypes);
const [entryOptionsDataArray, setEntryOptionsDataArray] =
useState<Rule[][]>(defaultRules);
const [entryRuleTypeCondition, setEntryRuleTypeCondition] = useState<ConditionType>(
OPERATOR_OPTIONS[1]?.value as ConditionType
);
const [entryOptionTypeArray, setEntryOptionTypeArray] = useState<ConditionType[]>(defaultConditionTypes);
const [entryOptionsDataArray, setEntryOptionsDataArray] = useState<Rule[][]>(defaultRules);

const [selectedCriteria, setSelectedCriteria] = useState(-1);
const [selectedRules, setSelectedRule] = useState<Rule[]>([]);

const [entryOptionsDataArrayUpdate, setEntryOptionsDataArrayUpdate] =
useState(-1);
const [entryOptionsDataArrayUpdate, setEntryOptionsDataArrayUpdate] = useState(-1);
const [updateCriteriaIdx, setUpdateCriteriaIdx] = useState(-1);


const isDuplicateRule = (rule:Rule)=>{
const newRule = JSON.stringify(rule)
const isDuplicateRule = (rule: Rule) => {
const newRule = JSON.stringify(rule);

// check on current conditions
for(let i=0; i<selectedRules.length;i++){
const selectedRule = JSON.stringify(selectedRules[i])
if (newRule === selectedRule){
console.log(newRule, " equals ", selectedRule);
return true
for (let i = 0; i < selectedRules.length; i++) {
const selectedRule = JSON.stringify(selectedRules[i]);
if (newRule === selectedRule) {
console.log(newRule, ' equals ', selectedRule);

return true;
}
}

// check on already selected condtions
for (let i = 0; i < entryOptionsDataArray.length; i++) {
const _rules = entryOptionsDataArray[i]
for (let j = 0; j < _rules.length; j++) {
const selectedRule = JSON.stringify(_rules[j])
if (newRule === selectedRule){
console.log(newRule, " equals ", selectedRule);
return true
const _rules = entryOptionsDataArray[i];
for (let j = 0; j < _rules.length; j++) {
const selectedRule = JSON.stringify(_rules[j]);
if (newRule === selectedRule) {
console.log(newRule, ' equals ', selectedRule);
return true;
}
}
}
}

return false
}
return false;
};

const addNewRule = (newRule: Rule) => {
if(isDuplicateRule(newRule)){
return false
if (isDuplicateRule(newRule)) {
return false;
}

if (selectedCriteria === -1) {
Expand All @@ -78,7 +65,7 @@ export const useCriteriaState = (
setSelectedRule((prev) => [...prev, newRule]);
}

return true
return true;
};

const deleteRule = (idx: number) => {
Expand All @@ -97,13 +84,10 @@ export const useCriteriaState = (

const updateCondition = () => {
const optionTypeArrayUpdated = [...entryOptionTypeArray];
optionTypeArrayUpdated[entryOptionsDataArrayUpdate] =
entryRuleTypeCondition;
optionTypeArrayUpdated[entryOptionsDataArrayUpdate] = entryRuleTypeCondition;

const entryOptionsDataArrayUpdated = [...entryOptionsDataArray];
entryOptionsDataArrayUpdated[entryOptionsDataArrayUpdate] = [
...selectedRules,
];
entryOptionsDataArrayUpdated[entryOptionsDataArrayUpdate] = [...selectedRules];

setEntryOptionTypeArray(optionTypeArrayUpdated);
setEntryOptionsDataArray(entryOptionsDataArrayUpdated);
Expand Down Expand Up @@ -173,9 +157,7 @@ export interface CriteriaStateManagerType {
}

export const useCriteriaStateManager = (): CriteriaStateManagerType => {
const [seletedCriteria, setSelectedCriteria] = useState<SelectedCriteria>(
SelectedCriteria.CHAT
);
const [seletedCriteria, setSelectedCriteria] = useState<SelectedCriteria>(SelectedCriteria.CHAT);
const entryCriteria = useCriteriaState(
[
[
Expand Down Expand Up @@ -210,22 +192,21 @@ export const useCriteriaStateManager = (): CriteriaStateManagerType => {

const resetCriteriaIdx = () => {
entryCriteria.setUpdateCriteriaIdx(-1);
console.debug(entryCriteria, chatCriteria);
chatCriteria.setUpdateCriteriaIdx(-1);
};

const _generate = (
rules: Rule[][],
conditionTypes: ConditionType[]
): Condition[] => {
if(rules.length === 0){
return []
const _generate = (rules: Rule[][], conditionTypes: ConditionType[]): Condition[] => {
console.debug('generate', rules);
if (rules.length === 0) {
return [];
}
console.log(`Generating for ${JSON.stringify(rules)}`)
console.log("condition type",conditionTypes);

console.log(`Generating for ${JSON.stringify(rules)}`);
console.log('condition type', conditionTypes);

return conditionTypes.map((el, idx) => ({
[el]: rules[idx].map((_el) => _el),
[el]: rules[idx]?.map((_el) => _el) ?? [],
})) as any;
};

Expand All @@ -249,7 +230,6 @@ export const useCriteriaStateManager = (): CriteriaStateManagerType => {
},
} as any;
};

return {
entryCriteria,
chatCriteria,
Expand All @@ -260,4 +240,4 @@ export const useCriteriaStateManager = (): CriteriaStateManagerType => {
resetCriteriaIdx,
generateRule,
};
};
};
Loading