diff --git a/frontend/src/components/utils/id.tsx b/frontend/src/components/utils/id.tsx
index be690441a8..2328c69eb0 100644
--- a/frontend/src/components/utils/id.tsx
+++ b/frontend/src/components/utils/id.tsx
@@ -15,16 +15,13 @@ type tId = {
export const Id = (props: tId) => {
const { id, kind = NODE_OBJECT, preventCopy } = props;
- const queryString = getObjectDisplayLabel({
- id,
- kind,
- });
+ const queryString = getObjectDisplayLabel({ kind });
const query = gql`
${queryString}
`;
- const { loading, error, data } = useQuery(query);
+ const { loading, error, data } = useQuery(query, { variable: { ids: [id] } });
const object = data?.[kind]?.edges?.[0]?.node ?? {};
diff --git a/frontend/src/components/utils/pagination.tsx b/frontend/src/components/utils/pagination.tsx
index 904a7799d1..00f7141c1d 100644
--- a/frontend/src/components/utils/pagination.tsx
+++ b/frontend/src/components/utils/pagination.tsx
@@ -32,7 +32,7 @@ export const Pagination = (props: tPaginationType) => {
const pagesCount = Math.ceil(count / limit) || 1;
// Set the current page to 0 as it is an index
- const currentPage = offset / limit ?? 0;
+ const currentPage = offset / limit;
const offsetEnd = offset + limit > count ? count : offset + limit;
const offsetStart = offsetEnd > 0 ? offset + 1 : 0;
diff --git a/frontend/src/config/config.ts b/frontend/src/config/config.ts
index 41824a075a..30adcd9ac5 100644
--- a/frontend/src/config/config.ts
+++ b/frontend/src/config/config.ts
@@ -1,11 +1,13 @@
export const INFRAHUB_GITHUB_URL = "https://github.com/opsmill/infrahub";
-export const INFRAHUB_DOC_URL = "https://docs.infrahub.app/";
+export const INFRAHUB_DOC_URL = "https://docs.infrahub.app";
export const INFRAHUB_API_SERVER_URL = import.meta.env.DEV
? "http://localhost:8000"
: window.location.origin.toString();
+export const INFRAHUB_DOC_LOCAL = `${INFRAHUB_API_SERVER_URL}/docs`;
+
export const INFRAHUB_WEB_SOCKET_URL = "ws://localhost:8000";
export const CONFIG = {
diff --git a/frontend/src/config/constants.tsx b/frontend/src/config/constants.tsx
index 958aa17c2f..0ce2bafa91 100644
--- a/frontend/src/config/constants.tsx
+++ b/frontend/src/config/constants.tsx
@@ -8,6 +8,8 @@ export const REFRESH_TOKEN_KEY = "refresh_token";
export const NODE_OBJECT = "CoreNode";
+export const PROFILE_KIND = "CoreProfile";
+
export const TASK_TARGET = "CoreTaskTarget";
export const DATA_CHECK_OBJECT = "CoreDataCheck";
@@ -191,3 +193,9 @@ export const peersKindForForm = ["Attribute", "Parent"];
export const PROPOSED_CHANGES_EDITABLE_STATE = ["open", "closed"];
export const TASK_TAB = "tasks";
+
+export const SEARCH_ANY_FILTER = "any__value";
+
+export const SEARCH_PARTIAL_MATCH = "partial_match";
+
+export const SEARCH_FILTERS = [SEARCH_ANY_FILTER, SEARCH_PARTIAL_MATCH];
diff --git a/frontend/src/config/qsp.ts b/frontend/src/config/qsp.ts
index e905b2e27c..6a71cfdd00 100644
--- a/frontend/src/config/qsp.ts
+++ b/frontend/src/config/qsp.ts
@@ -6,11 +6,12 @@ export const QSP = {
BRANCH_FILTER_TIME_TO: "time_to",
BRANCH: "branch",
KIND: "kind",
- VALIDATOR_DETAILS: "validator",
DATETIME: "at",
FILTER: "filters",
PAGINATION: "pagination",
PROPOSED_CHANGES_TAB: "pr_tab",
+ QUERY: "query",
TAB: "tab",
TASK_ID: "task_id",
+ LIST_SEARCH: "list-search",
};
diff --git a/frontend/src/config/routes.tsx b/frontend/src/config/routes.tsx
deleted file mode 100644
index 5075760231..0000000000
--- a/frontend/src/config/routes.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import ArtifactsObjectItemDetailsPaginated from "../screens/artifacts/object-item-details-paginated";
-import { BrancheItemDetails } from "../screens/branches/branche-item-details";
-import { BranchesItems } from "../screens/branches/branches-items";
-import { Homepage } from "../screens/homepage";
-import ObjectItemDetailsPaginated from "../screens/object-item-details/object-item-details-paginated";
-import ObjectItemsPaginated from "../screens/object-items/object-items-paginated";
-import SchemaPage from "../screens/schema/schema-page";
-import { ProposedChangesDetails } from "../screens/proposed-changes/proposed-changes-details";
-import { ProposedChanges } from "../screens/proposed-changes/proposed-changes-items";
-import { TaskItemDetailsScreen } from "../screens/tasks/task-item-details-screen";
-import { TaskItemsScreen } from "../screens/tasks/task-items-screen";
-import UserProfile from "../screens/user-profile/user-profile";
-import { ARTIFACT_OBJECT } from "./constants";
-
-export const MAIN_ROUTES = [
- {
- path: "/branches/:branchname",
- element:
,
- },
- {
- path: "/branches",
- element:
,
- },
- // {
- // path: "/groups/:groupname/:groupid",
- // element:
,
- // },
- // {
- // path: "/groups/:groupname",
- // element:
,
- // },
- // {
- // path: "/groups",
- // element:
,
- // },
- {
- path: `/objects/${ARTIFACT_OBJECT}/:objectid`,
- element:
,
- },
- {
- path: "/objects/:objectname/:objectid",
- element:
,
- },
- {
- path: "/objects/:objectname",
- element:
,
- },
- {
- path: "/profile",
- element:
,
- },
- {
- path: "/proposed-changes/:proposedchange",
- element:
,
- },
- {
- path: "/proposed-changes",
- element:
,
- },
- {
- path: "/tasks/:task",
- element:
,
- },
- {
- path: "/tasks",
- element:
,
- },
- {
- path: "/schema",
- element:
,
- },
- {
- path: "/",
- element:
,
- },
-];
diff --git a/frontend/src/config/sentry.ts b/frontend/src/config/sentry.ts
deleted file mode 100644
index 34c1bc06a3..0000000000
--- a/frontend/src/config/sentry.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import * as Sentry from "@sentry/react";
-import { BrowserTracing } from "@sentry/tracing";
-import { Config } from "../state/atoms/config.atom";
-
-const DEFAULT_DSN =
- "https://c271c704fe5a43b3b08c83919f0d8e01@o4504893920247808.ingest.sentry.io/4504893931520000";
-
-const TRACING_INSTANCE = new BrowserTracing();
-
-const REPLAY_INSTANCE = new Sentry.Replay();
-
-// Flag to init or not Sentry
-// TODO: find a better way to init the client from the config
-let isInitialised = false;
-
-const SentryClient = (config?: Config) => {
- if (!config?.logging?.remote?.enable) {
- return;
- }
-
- if (isInitialised) {
- return;
- }
-
- isInitialised = true;
-
- Sentry.init({
- dsn: config?.logging?.remote?.frontend_dsn ?? DEFAULT_DSN,
- integrations: [TRACING_INSTANCE, REPLAY_INSTANCE],
- });
-
- // Sentry.configureScope((scope: any) => scope.setTransactionName("MainApp"));
-};
-
-export default SentryClient;
diff --git a/frontend/src/decorators/withSchemaContext.tsx b/frontend/src/decorators/withSchemaContext.tsx
index b4bbd91a76..9f70c5d092 100644
--- a/frontend/src/decorators/withSchemaContext.tsx
+++ b/frontend/src/decorators/withSchemaContext.tsx
@@ -1,4 +1,4 @@
-import { useAtom, useAtomValue } from "jotai";
+import { useAtom, useAtomValue, useSetAtom } from "jotai";
import * as R from "ramda";
import { createContext } from "react";
import { toast } from "react-toastify";
@@ -14,7 +14,9 @@ import {
iGenericSchema,
iNamespace,
iNodeSchema,
+ IProfileSchema,
namespacesState,
+ profilesAtom,
schemaState,
} from "../state/atoms/schema.atom";
import { schemaKindLabelState } from "../state/atoms/schemaKindLabel.atom";
@@ -34,11 +36,12 @@ export const SchemaContext = createContext
({
export const withSchemaContext = (AppComponent: any) => (props: any) => {
const [currentBranch, setCurrentBranch] = useAtom(currentBranchAtom);
const [currentSchemaHash, setCurrentSchemaHash] = useAtom(currentSchemaHashAtom);
- const [, setSchema] = useAtom(schemaState);
- const [, setSchemaKindNameState] = useAtom(schemaKindNameState);
- const [, setSchemaKindLabelState] = useAtom(schemaKindLabelState);
- const [, setGenerics] = useAtom(genericsState);
- const [, setNamespaces] = useAtom(namespacesState);
+ const setSchema = useSetAtom(schemaState);
+ const setSchemaKindNameState = useSetAtom(schemaKindNameState);
+ const setSchemaKindLabelState = useSetAtom(schemaKindLabelState);
+ const setGenerics = useSetAtom(genericsState);
+ const setNamespaces = useSetAtom(namespacesState);
+ const setProfiles = useSetAtom(profilesAtom);
const branches = useAtomValue(branchesState);
const [branchInQueryString] = useQueryParam(QSP.BRANCH, StringParam);
@@ -52,12 +55,14 @@ export const withSchemaContext = (AppComponent: any) => (props: any) => {
nodes: iNodeSchema[];
generics: iGenericSchema[];
namespaces: iNamespace[];
+ profiles: IProfileSchema[];
} = await fetchUrl(CONFIG.SCHEMA_URL(branch?.name));
const hash = schemaData.main;
const schema = sortByName(schemaData.nodes || []);
const generics = sortByName(schemaData.generics || []);
const namespaces = sortByName(schemaData.namespaces || []);
+ const profiles = sortByName(schemaData.profiles || []);
schema.forEach((s) => {
s.attributes = sortByOrderWeight(s.attributes || []);
@@ -80,6 +85,7 @@ export const withSchemaContext = (AppComponent: any) => (props: any) => {
setSchemaKindNameState(schemaKindNameMap);
setSchemaKindLabelState(schemaKindLabelMap);
setNamespaces(namespaces);
+ setProfiles(profiles);
} catch (error) {
toast(
diff --git a/frontend/src/generated/graphql.tsx b/frontend/src/generated/graphql.tsx
index 26c4d1a7d1..ffae57c242 100644
--- a/frontend/src/generated/graphql.tsx
+++ b/frontend/src/generated/graphql.tsx
@@ -3,427 +3,757 @@ export type InputMaybe = Maybe;
export type Exact = { [K in keyof T]: T[K] };
export type MakeOptional = Omit & { [SubKey in K]?: Maybe };
export type MakeMaybe = Omit & { [SubKey in K]: Maybe };
+export type MakeEmpty = {
+ [_ in K]?: never;
+};
+export type Incremental =
+ | T
+ | { [P in keyof T]?: P extends " $fragmentName" | "__typename" ? T[P] : never };
/** All built-in and custom scalars, mapped to their actual values */
export type Scalars = {
- ID: string;
- String: string;
- Boolean: boolean;
- Int: number;
- Float: number;
- DateTime: any;
- GenericScalar: any;
- UUID: any;
+ ID: { input: string; output: string };
+ String: { input: string; output: string };
+ Boolean: { input: boolean; output: boolean };
+ Int: { input: number; output: number };
+ Float: { input: number; output: number };
+ DateTime: { input: any; output: any };
+ GenericScalar: { input: any; output: any };
+ UUID: { input: any; output: any };
};
/** Attribute of type GenericScalar */
export type AnyAttribute = AttributeInterface & {
__typename?: "AnyAttribute";
- id?: Maybe;
- is_inherited?: Maybe;
- is_protected?: Maybe;
- is_visible?: Maybe;
+ id?: Maybe;
+ is_default?: Maybe;
+ is_from_profile?: Maybe;
+ is_inherited?: Maybe;
+ is_protected?: Maybe;
+ is_visible?: Maybe;
owner?: Maybe;
source?: Maybe;
- updated_at?: Maybe;
- value?: Maybe;
-};
-
-export type AnyAttributeInput = {
- is_protected?: InputMaybe;
- is_visible?: InputMaybe;
- owner?: InputMaybe;
- source?: InputMaybe;
- value?: InputMaybe;
+ updated_at?: Maybe;
+ value?: Maybe;
};
export type AttributeInterface = {
- is_inherited?: Maybe;
- is_protected?: Maybe;
- is_visible?: Maybe;
- updated_at?: Maybe;
+ is_default?: Maybe;
+ is_inherited?: Maybe;
+ is_protected?: Maybe;
+ is_visible?: Maybe;
+ updated_at?: Maybe;
};
/** Branch */
export type Branch = {
__typename?: "Branch";
- branched_from?: Maybe;
- created_at?: Maybe;
- description?: Maybe;
- has_schema_changes?: Maybe;
- id: Scalars["String"];
- is_default?: Maybe;
- is_isolated?: Maybe;
- name: Scalars["String"];
- origin_branch?: Maybe;
- sync_with_git?: Maybe;
+ branched_from?: Maybe;
+ created_at?: Maybe;
+ description?: Maybe;
+ has_schema_changes?: Maybe;
+ id: Scalars["String"]["output"];
+ is_default?: Maybe;
+ is_isolated?: Maybe;
+ name: Scalars["String"]["output"];
+ origin_branch?: Maybe;
+ sync_with_git?: Maybe;
};
export type BranchCreate = {
__typename?: "BranchCreate";
object?: Maybe;
- ok?: Maybe;
+ ok?: Maybe;
};
export type BranchCreateInput = {
- branched_from?: InputMaybe;
- description?: InputMaybe;
- id?: InputMaybe;
- is_isolated?: InputMaybe;
- name: Scalars["String"];
- origin_branch?: InputMaybe;
- sync_with_git?: InputMaybe;
+ branched_from?: InputMaybe;
+ description?: InputMaybe;
+ id?: InputMaybe;
+ is_isolated?: InputMaybe;
+ name: Scalars["String"]["input"];
+ origin_branch?: InputMaybe;
+ sync_with_git?: InputMaybe;
};
export type BranchDelete = {
__typename?: "BranchDelete";
- ok?: Maybe;
+ ok?: Maybe;
};
export type BranchMerge = {
__typename?: "BranchMerge";
object?: Maybe;
- ok?: Maybe;
+ ok?: Maybe;
};
export type BranchNameInput = {
- name?: InputMaybe;
+ name?: InputMaybe;
};
export type BranchRebase = {
__typename?: "BranchRebase";
object?: Maybe;
- ok?: Maybe;
+ ok?: Maybe;
};
export type BranchUpdate = {
__typename?: "BranchUpdate";
- ok?: Maybe;
+ ok?: Maybe;
};
export type BranchUpdateInput = {
- description?: InputMaybe;
- is_isolated?: InputMaybe;
- name: Scalars["String"];
+ description?: InputMaybe;
+ is_isolated?: InputMaybe;
+ name: Scalars["String"]["input"];
};
export type BranchValidate = {
__typename?: "BranchValidate";
- messages?: Maybe>>;
+ messages?: Maybe>>;
object?: Maybe;
- ok?: Maybe;
+ ok?: Maybe;
};
-/** Represents the role of an object */
-export type BuiltinRole = CoreNode & {
- __typename?: "BuiltinRole";
- _updated_at?: Maybe;
+/** IPv6 or IPv4 address */
+export type BuiltinIpAddress = {
+ address: IpHost;
description?: Maybe;
- display_label?: Maybe;
- id: Scalars["String"];
- label?: Maybe;
+ display_label?: Maybe;
+ /** Unique identifier */
+ id?: Maybe;
+ ip_namespace?: Maybe;
+ ip_prefix?: Maybe;
member_of_groups?: Maybe;
- name: TextAttribute;
subscriber_of_groups?: Maybe;
};
-/** Represents the role of an object */
-export type BuiltinRoleMember_Of_GroupsArgs = {
- description__is_protected?: InputMaybe;
- description__is_visible?: InputMaybe;
- description__owner__id?: InputMaybe;
- description__source__id?: InputMaybe;
- description__value?: InputMaybe;
- description__values?: InputMaybe>>;
- ids?: InputMaybe>>;
- label__is_protected?: InputMaybe;
- label__is_visible?: InputMaybe;
- label__owner__id?: InputMaybe;
- label__source__id?: InputMaybe;
- label__value?: InputMaybe;
- label__values?: InputMaybe>>;
- limit?: InputMaybe;
- name__is_protected?: InputMaybe;
- name__is_visible?: InputMaybe;
- name__owner__id?: InputMaybe;
- name__source__id?: InputMaybe;
- name__value?: InputMaybe;
- name__values?: InputMaybe>>;
- offset?: InputMaybe;
-};
-
-/** Represents the role of an object */
-export type BuiltinRoleSubscriber_Of_GroupsArgs = {
- description__is_protected?: InputMaybe;
- description__is_visible?: InputMaybe;
- description__owner__id?: InputMaybe;
- description__source__id?: InputMaybe;
- description__value?: InputMaybe;
- description__values?: InputMaybe>>;
- ids?: InputMaybe>>;
- label__is_protected?: InputMaybe;
- label__is_visible?: InputMaybe;
- label__owner__id?: InputMaybe;
- label__source__id?: InputMaybe;
- label__value?: InputMaybe;
- label__values?: InputMaybe>>;
- limit?: InputMaybe;
- name__is_protected?: InputMaybe;
- name__is_visible?: InputMaybe;
- name__owner__id?: InputMaybe;
- name__source__id?: InputMaybe;
- name__value?: InputMaybe;
- name__values?: InputMaybe>>;
- offset?: InputMaybe;
-};
-
-/** Represents the role of an object */
-export type BuiltinRoleCreate = {
- __typename?: "BuiltinRoleCreate";
- object?: Maybe;
- ok?: Maybe;
-};
-
-export type BuiltinRoleCreateInput = {
- description?: InputMaybe;
- id?: InputMaybe;
- label?: InputMaybe;
- member_of_groups?: InputMaybe>>;
- name: TextAttributeInput;
- subscriber_of_groups?: InputMaybe>>;
-};
-
-/** Represents the role of an object */
-export type BuiltinRoleDelete = {
- __typename?: "BuiltinRoleDelete";
- ok?: Maybe