Skip to content

Commit 0fe25a2

Browse files
fgatti675fgatti675
committed
Version update
1 parent 122cb2b commit 0fe25a2

File tree

22 files changed

+26
-51
lines changed

22 files changed

+26
-51
lines changed

‎examples/example_pro/src/SupabaseApp/useSupabaseDataSourceDelegate.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export function useSupabaseDelegate({ supabase }: SupabaseDataSourceProps): Supa
8686
if (error) {
8787
throw error;
8888
}
89-
return createEntityFromDocument(data, databaseId);
89+
return createEntityFromDocument(data, path, databaseId);
9090
}, [supabase]);
9191

9292
// const listenEntity = useCallback((
@@ -124,12 +124,11 @@ export function useSupabaseDelegate({ supabase }: SupabaseDataSourceProps): Supa
124124
data,
125125
error
126126
} = await query;
127-
console.log("new data", { props }, data);
128127

129128
if (error) {
130129
throw error;
131130
}
132-
return data.map((doc: any) => createEntityFromDocument(doc));
131+
return data.map((doc: any) => createEntityFromDocument(doc, path, props.collection?.databaseId));
133132
}, [buildQuery]);
134133

135134
// const listenCollection = useCallback(<M extends Record<string, any>>(
@@ -317,23 +316,20 @@ export function useSupabaseDelegate({ supabase }: SupabaseDataSourceProps): Supa
317316
generateEntityId,
318317
countEntities,
319318
isFilterCombinationValid,
320-
initTextSearch: async ({
321-
path,
322-
databaseId,
323-
collection
324-
}): Promise<boolean> => {
319+
initTextSearch: async (): Promise<boolean> => {
325320
return true;
326321
}
327322
};
328323
}
329324

330325
const createEntityFromDocument = <M extends Record<string, any>>(
331326
data: any,
327+
path: string,
332328
databaseId?: string
333329
): Entity<M> => {
334330
return {
335331
id: data.id,
336-
path: data.path,
332+
path: path,
337333
values: data,
338334
databaseId
339335
};

‎packages/cli/templates/template/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"private": true,
55
"type": "module",
66
"dependencies": {
7-
"@firecms/core": "^3.0.0-canary",
8-
"@firecms/firebase": "^3.0.0-canary",
9-
"@firecms/ui": "^3.0.0-canary",
7+
"@firecms/core": "^3.0.0-beta",
8+
"@firecms/firebase": "^3.0.0-beta",
9+
"@firecms/ui": "^3.0.0-beta",
1010
"firebase": "^10.12.2",
1111
"react": "^18.3.1",
1212
"react-dom": "^18.3.1",

‎packages/cli/templates/template_cloud/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"logout": "firecms logout"
1313
},
1414
"dependencies": {
15-
"@firecms/cloud": "^3.0.0-canary",
15+
"@firecms/cloud": "^3.0.0-beta",
1616
"firebase": "^10.12.2",
1717
"react": "^18.3.1",
1818
"react-dom": "^18.3.1"

‎packages/cli/templates/template_pro/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
"dependencies": {
77
"typeface-rubik": "^1.1.13",
88
"@fontsource/jetbrains-mono": "^5.0.20",
9-
"@firecms/collection_editor": "^3.0.0-canary",
10-
"@firecms/collection_editor_firebase": "^3.0.0-canary",
11-
"@firecms/core": "^3.0.0-canary",
12-
"@firecms/data_enhancement": "^3.0.0-canary",
13-
"@firecms/data_import": "^3.0.0-canary",
14-
"@firecms/data_export": "^3.0.0-canary",
15-
"@firecms/firebase": "^3.0.0-canary",
16-
"@firecms/schema_inference": "^3.0.0-canary",
17-
"@firecms/ui": "^3.0.0-canary",
18-
"@firecms/user_management": "^3.0.0-canary",
9+
"@firecms/collection_editor": "^3.0.0-beta",
10+
"@firecms/collection_editor_firebase": "^3.0.0-beta",
11+
"@firecms/core": "^3.0.0-beta",
12+
"@firecms/data_enhancement": "^3.0.0-beta",
13+
"@firecms/data_import": "^3.0.0-beta",
14+
"@firecms/data_export": "^3.0.0-beta",
15+
"@firecms/firebase": "^3.0.0-beta",
16+
"@firecms/schema_inference": "^3.0.0-beta",
17+
"@firecms/ui": "^3.0.0-beta",
18+
"@firecms/user_management": "^3.0.0-beta",
1919
"firebase": "^10.12.2",
2020
"react": "^18.3.1",
2121
"react-dom": "^18.3.1",

‎packages/collection_editor_firebase/src/hooks/useFirestoreCollectionsConfigController.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export function useFirestoreCollectionsConfigController<EC extends PersistedColl
216216
if (newPropertiesOrder) {
217217
data.propertiesOrder = newPropertiesOrder;
218218
}
219-
console.log("Saving property", {
219+
console.debug("Saving property", {
220220
path,
221221
propertyKey,
222222
property,
@@ -254,7 +254,7 @@ export function useFirestoreCollectionsConfigController<EC extends PersistedColl
254254
if (newPropertiesOrder) {
255255
data.propertiesOrder = newPropertiesOrder;
256256
}
257-
console.log("Deleting property", {
257+
console.debug("Deleting property", {
258258
path,
259259
propertyKey,
260260
collectionPath,

‎packages/data_enhancement/src/api.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ export async function autocompleteStream(props: {
195195
}
196196

197197
}).then(() => {
198-
console.log("Autocomplete result", result);
199198
return result;
200199
});
201200

‎packages/datatalk/src/api.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export async function streamDataTalkCommand(firebaseAccessToken: string,
3838
let result = "";
3939
const processChunk = (chunk: ReadableStreamReadResult<Uint8Array>): void | Promise<void> => {
4040
if (chunk.done) {
41-
console.log("Stream completed", { result });
41+
console.debug("Stream completed", { result });
4242
resolve(result);
4343
return;
4444
}
@@ -62,11 +62,10 @@ export async function streamDataTalkCommand(firebaseAccessToken: string,
6262
try {
6363
const message = JSON.parse(part);
6464
if (message.type === "delta") {
65-
console.log("Delta received:", message.data.delta);
6665
result += message.data.delta;
6766
onDelta(message.data.delta);
6867
} else if (message.type === "result") {
69-
console.log("Result received:", message.data);
68+
console.debug("Result received:", message.data);
7069
resolve(message.data.text);
7170
}
7271
} catch (error) {

‎packages/datatalk/src/components/TableResults.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,9 @@ export function TableResults({
111111

112112
const firestore = getFirestore();
113113
const firebaseValues = cmsToFirestoreModel(updatedValues, firestore);
114-
console.log("Saving", firebaseValues, entity);
115-
console.log("Firestore", firestore);
116114
const documentReference: DocumentReference = doc(firestore, entity.path);
117-
console.log("Document reference", documentReference)
118115
return setDoc(documentReference, firebaseValues, { merge: true })
119116
.then((res) => {
120-
console.log("Document updated", res);
121117
onValueUpdated();
122118
})
123119
.catch((error) => {

‎packages/editor/src/extensions/InlineAutocomplete.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ export const AutocompleteExtension = Node.create<
140140

141141
// Find the suggestion decoration
142142
const decoration = pluginState.find(cursorPos)?.[0];
143-
console.log(decoration);
144143
// @ts-ignore
145144
if (decoration && decoration.type?.spec?.suggestionText) {
146145
// @ts-ignore

‎packages/firecms_cloud/src/FireCMSCloudApp.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,11 @@ export function FireCMSCloudApp({
120120
fromUrl: backendApiHost + "/config"
121121
});
122122

123-
console.log("backendFirebaseApp", backendFirebaseApp);
124123
const fireCMSBackend = useBuildFireCMSBackend({
125124
backendApiHost,
126125
backendFirebaseApp
127126
});
128127

129-
130-
console.log("fireCMSBackend", fireCMSBackend);
131128
let component;
132129

133130
if (backendConfigLoading || !backendFirebaseApp) {
@@ -800,7 +797,6 @@ function buildAdminRoutes(usersLimit: number | undefined,
800797
hideFromNavigation: true,
801798
view: <DataTalkRoutes
802799
onAnalyticsEvent={(event, params) => {
803-
console.log("DataTalk event", event, params);
804800
onAnalyticsEvent?.("datatalk:" + event, params);
805801
}}
806802
apiEndpoint={dataTalkEndpoint}

‎packages/firecms_cloud/src/components/auth/FireCMSCloudLoginView.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ export function FireCMSCloudLoginView({
9797
<GoogleLoginButton
9898
disabled={!termsAccepted && includeTermsAndNewsLetter}
9999
onClick={() => {
100-
console.log("Google login");
101100
fireCMSBackend.googleLogin(includeGoogleAdminScopes).then((user) => {
102101
if (subscribeToNewsletter && user?.email) {
103102
subscribeNewsletter(user.email);
@@ -139,6 +138,5 @@ const subscribeNewsletter = (email: string) => {
139138
source: "saas"
140139
})
141140
}).then((res) => {
142-
console.log("newsletter response", res);
143141
});
144142
}

‎packages/firecms_core/src/components/EntityCollectionTable/fields/TableReferenceField.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export const TableReferenceFieldInternal = React.memo(
6767
}, [updateValue]);
6868

6969
const onMultipleEntitiesSelected = useCallback((entities: Entity<any>[]) => {
70-
console.log("onMultipleEntitiesSelected", entities);
7170
updateValue(entities.map((e) => getReferenceFrom(e)));
7271
}, [updateValue]);
7372

‎packages/firecms_core/src/components/EntityCollectionTable/fields/TableStorageUpload.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ function StorageUpload({
179179
onDropRejected: (fileRejections, event) => {
180180
for (const fileRejection of fileRejections) {
181181
for (const error of fileRejection.errors) {
182-
console.log("Error uploading file: ", error);
182+
console.error("Error uploading file: ", error);
183183
if (error.code === "file-too-large") {
184184
snackbarContext.open({
185185
type: "error",

‎packages/firecms_core/src/components/EntityCollectionView/EntityCollectionView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ export const EntityCollectionView = React.memo(
207207
}, [tableController.setPopupCell]);
208208

209209
const onEntityClick = useCallback((clickedEntity: Entity<M>) => {
210-
console.log("Entity clicked", clickedEntity)
211210
const collection = collectionRef.current;
212211
setHighlightedEntity(clickedEntity);
213212
analyticsController.onAnalyticsEvent?.("edit_entity_clicked", {

‎packages/firecms_core/src/components/HomePage/DefaultHomePage.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ export function DefaultHomePage({
8282
setFilteredUrls(null);
8383
} else {
8484
const searchResult = fuse.current?.search(value);
85-
console.log("Search result", searchResult);
8685
if (searchResult) {
8786
setFilteredUrls(searchResult.map((e) => e.item.url));
8887
}

‎packages/firecms_core/src/components/SearchIconsView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ export function SearchIconsView({
4646
}, [query, updateSearchResults]);
4747

4848
const icons = keys === null ? coolIconKeys : keys;
49-
console.log("Icons", icons);
5049

5150
return (
5251
<>

‎packages/firecms_core/src/components/SelectableTable/filters/StringNumberFilterField.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ export function StringNumberFilterField({
9393

9494
const multiple = multipleSelectOperations.includes(operation);
9595

96-
console.log("internalValue", { internalValue });
9796
return (
9897

9998
<div className="flex w-[440px]">

‎packages/firecms_core/src/core/DefaultDrawer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export function DefaultDrawer({
9393
.map((view, index) =>
9494
<DrawerNavigationItem
9595
key={`navigation_${index}`}
96-
icon={<IconForView collectionOrView={view.collection ?? view.view}/>}
96+
icon={<IconForView collectionOrView={view.collection ?? view.view} size={"small"}/>}
9797
tooltipsOpen={tooltipsOpen}
9898
adminMenuOpen={adminMenuOpen}
9999
drawerOpen={drawerOpen}

‎packages/firecms_core/src/core/EntityEditView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ export function EntityEditViewInner<M extends Record<string, any>>({
299299
onUpdate({ entity: updatedEntity });
300300

301301
if (closeAfterSave) {
302-
console.log("Closing side dialog")
303302
sideDialogContext.setBlocked(false);
304303
sideDialogContext.close(true);
305304
onClose?.();

‎packages/firecms_core/src/core/SideDialogs.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ function SideDialogView({
9494
const handleDrawerCloseOk = () => {
9595
setBlocked(false);
9696
setDrawerCloseRequested(false);
97-
console.log("handleDrawerCloseOk");
9897
sideDialogsController.close();
9998
panel?.onClose?.();
10099
};

‎packages/firecms_core/src/form/field_bindings/StorageUploadFieldBinding.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function FileDropComponent({
182182
onDropRejected: (fileRejections, event) => {
183183
for (const fileRejection of fileRejections) {
184184
for (const error of fileRejection.errors) {
185-
console.log("Error uploading file: ", error);
185+
console.error("Error uploading file: ", error);
186186
if (error.code === "file-too-large") {
187187
snackbarContext.open({
188188
type: "error",

‎packages/ui/src/components/MultiSelect.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ export const MultiSelect = React.forwardRef<
9494
) => {
9595
const [isPopoverOpen, setIsPopoverOpen] = React.useState(open ?? false);
9696
const [selectedValues, setSelectedValues] = React.useState<string[]>(value ?? []);
97-
console.log("selectedValues", selectedValues);
9897

9998
const onPopoverOpenChange = (open: boolean) => {
10099
setIsPopoverOpen(open);

0 commit comments

Comments
 (0)