fix: removed all references to src folder, causing dublicate imports

EAVFW · Nov 27, 2024 · f024002 · f024002
1 parent fbb76da
commit f024002
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 25 deletions.
diff --git a/packages/core/src/components/question/input-types/baseinput/BaseInputComponent.tsx b/packages/core/src/components/question/input-types/baseinput/BaseInputComponent.tsx
@@ -1,9 +1,9 @@
 "use client";
 import { quickformtokens, useHandleEnterKeypress, useQuickForm } from "@eavfw/quickform-core";
-import { useFocusableQuestion } from "@eavfw/quickform-core/src/hooks/useFocusableQuestion";
+import { useFocusableQuestion } from "@eavfw/quickform-core";
 import { CSSProperties, ChangeEvent, InputHTMLAttributes, useEffect, useState } from "react";
 import { makeStyles, mergeClasses, shorthands } from '@griffel/react';
-import { QuestionModel } from "@eavfw/quickform-core/src/model";
+import { QuestionModel } from "@eavfw/quickform-core";
 import { IconResolver, IconType } from "../../../icons/IconResolver";
 
 import { trace } from "@opentelemetry/api";

diff --git a/packages/core/src/components/question/input-types/email/EmailInputSchema.ts b/packages/core/src/components/question/input-types/email/EmailInputSchema.ts
@@ -1,5 +1,5 @@
 import { InputComponentMetadata } from "@eavfw/quickform-core";
-import { InputPropertiesTypes } from "@eavfw/quickform-core/src/model";
+import { InputPropertiesTypes } from "@eavfw/quickform-core";
 
 export const emailInputSchema: InputComponentMetadata<InputPropertiesTypes> = {
     label: "Email",

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -4,4 +4,5 @@ export * from "./services";
 export * from "./hooks";
 export * from "./style";
 export type * from "./model";
+export * from "./utils/quickformUtils";
 export { defaultQuickFormTokens } from "./style/defaultQuickFormTokens";
diff --git a/packages/designer/src/Components/Drawers/QuestionTreeItem.tsx b/packages/designer/src/Components/Drawers/QuestionTreeItem.tsx
@@ -1,4 +1,4 @@
-import { QuestionJsonModel } from "@eavfw/quickform-core/src/model/json-definitions/JsonDataModels";
+
 import {
     Button,
     makeStyles,
@@ -67,7 +67,7 @@ const QuestionTreeItem: React.FC<QuestionTreeItemProps> = ({ setView, setActiveQ
             const q = old.questions[key];
             q.order = index + 1;
 
-            old.questions = Object.fromEntries(Object.entries(old.questions).map(([k, q], i) => [k, q, q.order ?? i] as [string, QuestionJsonModel, number]).sort(([k, a, i], [k1, b, j]) => i - j));
+            old.questions = Object.fromEntries(Object.entries(old.questions).map(([k, q], i) => [k, q, q.order ?? i] as [string, QuickFormQuestionDefinition, number]).sort(([k, a, i], [k1, b, j]) => i - j));
 
             return { ...old };
         });

diff --git a/packages/designer/src/Components/Header/QuickFormSettingsViewHeader.tsx b/packages/designer/src/Components/Header/QuickFormSettingsViewHeader.tsx
@@ -22,8 +22,8 @@ import { useViewStyles } from "../Styles/useViewStyles.styles";
 import { useQuickFormDefinition } from "../../Contexts/QuickFormDefContext";
 import { EditSettingsRegular } from "@fluentui/react-icons"
 import { removeNonAlphanumeric } from "@eavfw/utils";
-import { QuestionJsonModel } from "@eavfw/quickform-core/src/model/json-definitions/JsonDataModels";
 import { VisibilityQueryField } from "@eavfw/quickform-querybuilder";
+import { QuickFormQuestionDefinition } from "@eavfw/quickform-core";
 
 const useStyles = makeStyles({
     content: {
@@ -101,7 +101,7 @@ export const QuickFormSettingsViewHeader: React.FC = () => {
                                         onChange={(e, d) => updateQuickFormPayload(old => {
                                             old.questions[activeQuestion].order = parseInt(d.value);
 
-                                            old.questions = Object.fromEntries(Object.entries(old.questions).map(([k, q], i) => [k, q, q.order ?? i] as [string, QuestionJsonModel, number]).sort(([k, a, i], [k1, b, j]) => i - j))
+                                            old.questions = Object.fromEntries(Object.entries(old.questions).map(([k, q], i) => [k, q, q.order ?? i] as [string, QuickFormQuestionDefinition, number]).sort(([k, a, i], [k1, b, j]) => i - j))
 
                                             return { ...old }
                                         })} />

diff --git a/packages/designer/src/Components/Views/QuickFormLayoutView.tsx b/packages/designer/src/Components/Views/QuickFormLayoutView.tsx
@@ -6,7 +6,7 @@ import { useEffect, useMemo } from "react";
 import { removeNonAlphanumeric } from "@eavfw/utils";
 import { SerializedNodes } from "@craftjs/core"
 
-import { RowColumnsLayout } from "@eavfw/quickform-core/src/model/json-definitions/Layout";
+import { RowColumnsLayout } from "@eavfw/quickform-core";
 import { QuickFormDefinition } from "@eavfw/quickform-core";
 
 

diff --git a/...s/inputs/select/src/dropdown-options-list/dropdown-select-option/DropdownSelectOption.tsx b/...s/inputs/select/src/dropdown-options-list/dropdown-select-option/DropdownSelectOption.tsx
@@ -2,7 +2,6 @@ import { MouseEventHandler, ReactNode } from "react";
 import classNames from "classnames";
 import styles from "./DropdownSelectOption.module.css";
 import { makeStyles, mergeClasses } from "@griffel/react";
-import { Checkmark } from "@eavfw/quickform-core/src/components/icons";
 import { shorthands } from "@fluentui/react-components";
 import { quickformtokens, IconResolver } from "@eavfw/quickform-core";
 

diff --git a/packages/playground/src/components/baseinput/BaseInputComponent.tsx b/packages/playground/src/components/baseinput/BaseInputComponent.tsx
@@ -1,8 +1,8 @@
 import { quickformtokens, useHandleEnterKeypress, useQuickForm } from "@eavfw/quickform-core";
-import { useFocusableQuestion } from "@eavfw/quickform-core/src/hooks/useFocusableQuestion";
+import { useFocusableQuestion } from "@eavfw/quickform-core";
 import { CSSProperties, ChangeEvent, InputHTMLAttributes, useEffect, useState } from "react";
 import { makeStyles, mergeClasses, shorthands } from '@griffel/react';
-import { QuestionModel } from "@eavfw/quickform-core/src/model";
+import { QuestionModel } from "@eavfw/quickform-core";
 import { IconResolver, IconType } from "../../../../core/src/components/icons/IconResolver";
 
 import { trace } from "@opentelemetry/api";
@@ -106,11 +106,7 @@ export const BaseInputComponent: React.FC<BaseInputComponentProps> = ({ question
         if (span) {
             span.addEvent("BaseInputComponent:handleChange", { 'value': event.target.value });
         }
-        //EXPLAIN: WHY IS THIS HERE? If no reason, lets remove.
-        if (event.target.value === "")
-            questionModel.errorMsg = "";
-
-
+
         setText(() => event.target.value);
         answerQuestion(questionModel.logicalName, event.target.value, true);
         resize();

diff --git a/packages/playground/src/components/email/EmailInputSchema.ts b/packages/playground/src/components/email/EmailInputSchema.ts
@@ -1,5 +1,5 @@
 import { InputComponentMetadata } from "@eavfw/quickform-core";
-import { InputPropertiesTypes } from "@eavfw/quickform-core/src/model";
+import { InputPropertiesTypes } from "@eavfw/quickform-core";
 
 export const emailInputSchema: InputComponentMetadata<InputPropertiesTypes> = {
     label: "Email",

diff --git a/packages/playground/src/components/multiline/MultilineInputSchema.ts b/packages/playground/src/components/multiline/MultilineInputSchema.ts
@@ -1,6 +1,6 @@
 
 import { InputComponentMetadata } from "../../../../core/src/services/";
-import { InputPropertiesTypes, } from "@eavfw/quickform-core/src/model";
+import { InputPropertiesTypes, } from "@eavfw/quickform-core";
 
 export const multilineInputSchema: InputComponentMetadata<InputPropertiesTypes> = {
     label: "Multiline Text",

diff --git a/packages/playground/src/components/overview-list/OverviewList.tsx b/packages/playground/src/components/overview-list/OverviewList.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useQuickForm } from '../../../../core/src/state/QuickFormContext';
-import { isSlideAnswered } from '@eavfw/quickform-core/src/utils/quickformUtils';
+import { isSlideAnswered } from '@eavfw/quickform-core';
 
 export const OverviewList = () => {
     const { state, goToSlide } = useQuickForm();

diff --git a/packages/playground/src/components/phone/PhoneInputSchema.ts b/packages/playground/src/components/phone/PhoneInputSchema.ts
@@ -1,6 +1,6 @@
 
 import { InputComponentMetadata } from "../../../../core/src/services/";
-import { InputPropertiesTypes, } from "@eavfw/quickform-core/src/model";
+import { InputPropertiesTypes, } from "@eavfw/quickform-core";
 
 export const phoneInputSchema: InputComponentMetadata<InputPropertiesTypes> = {
     label: "Phone",

diff --git a/packages/playground/src/components/text/TextInputSchema.ts b/packages/playground/src/components/text/TextInputSchema.ts
@@ -1,6 +1,6 @@
 
 import { InputComponentMetadata } from "../../../../core/src/services/";
-import { InputPropertiesTypes, } from "@eavfw/quickform-core/src/model";
+import { InputPropertiesTypes, } from "@eavfw/quickform-core";
 
 export const textInputSchema: InputComponentMetadata<InputPropertiesTypes> = {
     label: "Text",

diff --git a/packages/querybuilder/src/VisibilityQueryField.tsx b/packages/querybuilder/src/VisibilityQueryField.tsx
@@ -8,12 +8,12 @@ import { QueryBuilder, defaultValidator, defaultOperators, formatQuery, RuleGrou
 
 import { EditRegular } from "@fluentui/react-icons";
 import { FieldTypes, InputComponentFieldMetadata, InputComponentMetadata, InputComponentSelectFieldMetadata, QuickformState, resolveInputComponent } from '@eavfw/quickform-core';
-import { QuickFormQuestionsDefinition } from '@eavfw/quickform-core/src/model/json-definitions/QuickFormQuestionsDefinition';
-import { QuestionJsonModel } from '@eavfw/quickform-core/src/model/json-definitions/JsonDataModels';
+import { QuickFormQuestionsDefinition } from '@eavfw/quickform-core';
+import { QuestionJsonModel } from '@eavfw/quickform-core';
 
 import 'react-querybuilder/dist/query-builder.scss';
-import { registerVisibilityEngine } from "@eavfw/quickform-core/src/state/action-handlers/VisibilityHandler";
-import { QuestionModel } from "@eavfw/quickform-core/src/model";
+import { registerVisibilityEngine } from "@eavfw/quickform-core";
+import { QuestionModel } from "@eavfw/quickform-core";
 import React from "react";
 
 type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] }