@databiosphere/findable-ui 35.2.0 → 37.0.0

package/src/providers/dataDictionaryState/actions/updateColumnFilters/utils.ts

@@ -0,0 +1,41 @@
+import { ColumnFiltersState, functionalUpdate } from "@tanstack/react-table";
+import { DataDictionaryState } from "../../types";
+import { UpdateColumnFiltersPayload } from "./types";
+
+/**
+ * Builds the next column filters state for the current dictionary.
+ * Uses TanStack updater to update the column filters state.
+ * @param state - State.
+ * @param payload - Payload.
+ * @returns column filters state.
+ */
+export function buildNextColumnFilters(
+  state: DataDictionaryState,
+  payload: UpdateColumnFiltersPayload
+): ColumnFiltersState {
+  return functionalUpdate(
+    payload.updaterOrValue,
+    getOldColumnFilters(state, payload)
+  );
+}
+
+/**
+ * Retrieves the current "old" column filters state.
+ * @param state - State.
+ * @param payload - Payload.
+ * @returns old column filters state.
+ */
+function getOldColumnFilters(
+  state: DataDictionaryState,
+  payload: UpdateColumnFiltersPayload
+): ColumnFiltersState {
+  // Grab the dictionary.
+  const dictionary = state.dictionaries[payload.dictionary];
+
+  // If the dictionary is not found, return an empty array.
+  if (!dictionary) return [];
+
+  // Grab column filters from dictionary state.
+  const { columnFilters = [] } = dictionary.state;
+  return columnFilters;
+}

package/src/providers/dataDictionaryState/actions/updateGlobalFilter/action.ts

@@ -0,0 +1,25 @@
+import { buildNextDictionaries } from "../../dictionaries/state";
+import { DataDictionaryState } from "../../types";
+import { UpdateGlobalFilterPayload } from "./types";
+import { buildNextGlobalFilter, buildNextMeta } from "./utils";
+
+/**
+ * Reducer function to handle the "update global filter" action.
+ * @param state - State.
+ * @param payload - Payload.
+ * @returns state.
+ */
+export function updateGlobalFilterAction(
+  state: DataDictionaryState,
+  payload: UpdateGlobalFilterPayload
+): DataDictionaryState {
+  const globalFilter = buildNextGlobalFilter(payload);
+  const meta = buildNextMeta(state, payload, globalFilter);
+  return {
+    ...state,
+    dictionaries: buildNextDictionaries(state, payload.dictionary, {
+      globalFilter,
+    }),
+    meta,
+  };
+}

package/src/providers/dataDictionaryState/actions/updateGlobalFilter/dispatch.ts

@@ -0,0 +1,16 @@
+import { DataDictionaryActionKind } from "../types";
+import { UpdateGlobalFilterAction, UpdateGlobalFilterPayload } from "./types";
+
+/**
+ * Action creator for updating global filter in the state.
+ * @param payload - Payload.
+ * @returns Action with payload and action type.
+ */
+export function updateGlobalFilter(
+  payload: UpdateGlobalFilterPayload
+): UpdateGlobalFilterAction {
+  return {
+    payload,
+    type: DataDictionaryActionKind.UpdateGlobalFilter,
+  };
+}

package/src/providers/dataDictionaryState/actions/updateGlobalFilter/types.ts

@@ -0,0 +1,12 @@
+import { Updater } from "@tanstack/react-table";
+import { DataDictionaryActionKind } from "../types";
+
+export type UpdateGlobalFilterAction = {
+  payload: UpdateGlobalFilterPayload;
+  type: DataDictionaryActionKind.UpdateGlobalFilter;
+};
+
+export interface UpdateGlobalFilterPayload {
+  dictionary: string;
+  updaterOrValue: Updater<string | undefined>;
+}

package/src/providers/dataDictionaryState/actions/updateGlobalFilter/utils.ts

@@ -0,0 +1,50 @@
+import { functionalUpdate } from "@tanstack/react-table";
+import { META_COMMAND } from "../../../../hooks/stateSyncManager/hooks/UseMetaCommands/types";
+import { DataDictionaryState } from "../../types";
+import { UpdateGlobalFilterPayload } from "./types";
+
+/**
+ * Builds the next global filter state for the current dictionary.
+ * Uses TanStack updater to update the global filter state.
+ * @param payload - Payload.
+ * @returns global filter state.
+ */
+export function buildNextGlobalFilter(
+  payload: UpdateGlobalFilterPayload
+): string | undefined {
+  return functionalUpdate(payload.updaterOrValue, undefined) || undefined;
+}
+
+/**
+ * Builds the next meta state for the current dictionary.
+ * @param state - State.
+ * @param payload - Payload.
+ * @param nextGlobalFilter - Next global filter.
+ * @returns meta state.
+ */
+export function buildNextMeta(
+  state: DataDictionaryState,
+  payload: UpdateGlobalFilterPayload,
+  nextGlobalFilter: string | undefined
+): DataDictionaryState["meta"] {
+  const currentGlobalFilter = getCurrentGlobalFilter(state, payload);
+  // Use PUSH method with adding or removing the global filter.
+  if (currentGlobalFilter === undefined || nextGlobalFilter === undefined) {
+    return { command: META_COMMAND.STATE_TO_URL_PUSH };
+  }
+  // Use REPLACE method with edits to the global filter.
+  return { command: META_COMMAND.STATE_TO_URL_REPLACE };
+}
+
+/**
+ * Returns the current global filter for the current dictionary.
+ * @param state - State.
+ * @param payload - Payload.
+ * @returns global filter.
+ */
+function getCurrentGlobalFilter(
+  state: DataDictionaryState,
+  payload: UpdateGlobalFilterPayload
+): string | undefined {
+  return state.dictionaries[payload.dictionary].state.globalFilter;
+}

package/src/providers/dataDictionaryState/actions/urlToState/action.ts

@@ -0,0 +1,28 @@
+import { parseJsonQueryParam } from "../../../../utils/parseJsonQueryParam";
+import { DATA_DICTIONARY_URL_PARAMS } from "../../dictionaries/constants";
+import { buildNextDictionaries } from "../../dictionaries/state";
+import { DataDictionaryState } from "../../types";
+import { UrlToStatePayload } from "./types";
+
+/**
+ * Reducer function to handle the "URL >> state sync" action.
+ * @param state - State.
+ * @param payload - Payload.
+ * @returns state.
+ */
+export function urlToStateAction(
+  state: DataDictionaryState,
+  payload: UrlToStatePayload
+): DataDictionaryState {
+  if (typeof payload.query.dictionary !== "string") return state;
+  return {
+    ...state,
+    dictionaries: buildNextDictionaries(state, payload.query.dictionary, {
+      columnFilters: parseJsonQueryParam(
+        payload.query[DATA_DICTIONARY_URL_PARAMS.COLUMN_FILTERS],
+        []
+      ),
+      globalFilter: payload.query[DATA_DICTIONARY_URL_PARAMS.GLOBAL_FILTER],
+    }),
+  };
+}

package/src/providers/dataDictionaryState/actions/urlToState/dispatch.ts

@@ -0,0 +1,14 @@
+import { DataDictionaryActionKind } from "../types";
+import { UrlToStateAction, UrlToStatePayload } from "./types";
+
+/**
+ * Action creator for URL >> state sync.
+ * @param payload - Payload.
+ * @returns Action with payload and action type.
+ */
+export function urlToState(payload: UrlToStatePayload): UrlToStateAction {
+  return {
+    payload,
+    type: DataDictionaryActionKind.UrlToState,
+  };
+}

package/src/providers/dataDictionaryState/actions/urlToState/types.ts

@@ -0,0 +1,11 @@
+import { NextRouter } from "next/router";
+import { DataDictionaryActionKind } from "../types";
+
+export type UrlToStateAction = {
+  payload: UrlToStatePayload;
+  type: DataDictionaryActionKind.UrlToState;
+};
+
+export type UrlToStatePayload = {
+  query: NextRouter["query"];
+};

package/src/providers/dataDictionaryState/context.ts

@@ -0,0 +1,9 @@
+import { createContext } from "react";
+import { INITIAL_DATA_DICTIONARY_STATE } from "./initializer/constants";
+import { DataDictionaryStateContextProps } from "./types";
+
+export const DataDictionaryStateContext =
+  createContext<DataDictionaryStateContextProps>({
+    dataDictionaryDispatch: null,
+    dataDictionaryState: INITIAL_DATA_DICTIONARY_STATE,
+  });

package/src/providers/dataDictionaryState/dictionaries/constants.ts

@@ -0,0 +1,4 @@
+export const DATA_DICTIONARY_URL_PARAMS = {
+  COLUMN_FILTERS: "filter",
+  GLOBAL_FILTER: "search",
+} as const;

package/src/providers/dataDictionaryState/dictionaries/state.ts

@@ -0,0 +1,45 @@
+import { TableState } from "@tanstack/react-table";
+import { stateToUrlQuery } from "../../../utils/stateToUrlQuery";
+import { DataDictionaryState } from "../types";
+import { DictionariesContext } from "./types";
+import { extractDictionaryUrlState as extractUrlState } from "./utils";
+
+/**
+ * Builds the next dictionaries context.
+ * @param state - State.
+ * @param dictionaryKey - Dictionary key.
+ * @param nextDictionaryState - Next dictionary state.
+ * @returns Next dictionaries context.
+ */
+export function buildNextDictionaries(
+  state: DataDictionaryState,
+  dictionaryKey: string,
+  nextDictionaryState: Partial<TableState>
+): DictionariesContext {
+  // Clone the dictionaries.
+  const dictionaries: DictionariesContext = { ...state.dictionaries };
+
+  for (const [key, dictionary] of Object.entries(dictionaries)) {
+    // Clone the dictionary context.
+    const dictionaryContext = { ...dictionary };
+
+    // If the dictionary key is a match, update the dictionary context.
+    if (key === dictionaryKey) {
+      // Update the dictionary state.
+      dictionaryContext.state = { ...dictionary.state, ...nextDictionaryState };
+
+      // Grab param values from the updated dictionary state.
+      const { columnFilters, globalFilter } = dictionaryContext.state;
+
+      // Update the dictionary query.
+      dictionaryContext.query = stateToUrlQuery(
+        extractUrlState(key, { columnFilters, globalFilter })
+      );
+    }
+
+    // Update the dictionary context.
+    dictionaries[key] = dictionaryContext;
+  }
+
+  return dictionaries;
+}

package/src/providers/dataDictionaryState/dictionaries/types.ts

@@ -0,0 +1,11 @@
+import { TableState } from "@tanstack/react-table";
+import { NextRouter } from "next/router";
+
+export interface DictionariesContext {
+  [key: string]: DictionaryContext;
+}
+
+export interface DictionaryContext {
+  query: NextRouter["query"];
+  state: Partial<TableState>;
+}

package/src/providers/dataDictionaryState/dictionaries/utils.ts

@@ -0,0 +1,25 @@
+import { ColumnFiltersState, TableState } from "@tanstack/react-table";
+import { DATA_DICTIONARY_URL_PARAMS } from "./constants";
+
+/**
+ * Extracts dictionary state properties that should be synchronized with URL parameters.
+ * This function maps specific properties from the dictionary state to a format
+ * that can be used to generate URL query parameters.
+ * The extracted properties are:
+ * - dictionary: Dictionary key (string).
+ * - filter: Applied column filters (ColumnFiltersState).
+ * - search: Applied global filter (GlobalFilterTableState) - typed as string or undefined.
+ * @param dictionary - Dictionary key.
+ * @param state - Dictionary table state.
+ * @returns Object with properties ready for URL query serialization.
+ */
+export function extractDictionaryUrlState(
+  dictionary: string,
+  state: Partial<TableState>
+): Record<string, string | ColumnFiltersState | undefined> {
+  return {
+    dictionary,
+    [DATA_DICTIONARY_URL_PARAMS.COLUMN_FILTERS]: state.columnFilters || [],
+    [DATA_DICTIONARY_URL_PARAMS.GLOBAL_FILTER]: state.globalFilter,
+  };
+}

package/src/providers/dataDictionaryState/hooks/UseDataDictionaryInitialArgs/hook.ts

@@ -0,0 +1,14 @@
+import { DataDictionaryConfig } from "../../../../common/entities";
+import { useConfig } from "../../../../hooks/useConfig";
+import { UseDataDictionaryInitialArgs } from "./types";
+
+export const useDataDictionaryInitialArgs =
+  (): UseDataDictionaryInitialArgs => {
+    const { config } = useConfig();
+
+    const dataDictionaries = config.dataDictionaries as
+      | DataDictionaryConfig[]
+      | undefined;
+
+    return { dataDictionaries };
+  };

package/src/providers/dataDictionaryState/hooks/UseDataDictionaryInitialArgs/types.ts

@@ -0,0 +1,5 @@
+import { DataDictionaryConfig } from "../../../../common/entities";
+
+export interface UseDataDictionaryInitialArgs {
+  dataDictionaries?: DataDictionaryConfig[];
+}

package/src/providers/dataDictionaryState/hooks/UseDataDictionaryReducer/hook.ts

@@ -0,0 +1,17 @@
+import { useReducer } from "react";
+import { initializer } from "../../initializer/initializer";
+import { dataDictionaryReducer } from "../../reducer";
+import { DataDictionaryStateContextProps } from "../../types";
+import { useDataDictionaryInitialArgs } from "../UseDataDictionaryInitialArgs/hook";
+
+export const useDataDictionaryReducer = (): DataDictionaryStateContextProps => {
+  const initialArgs = useDataDictionaryInitialArgs();
+
+  const [dataDictionaryState, dataDictionaryDispatch] = useReducer(
+    dataDictionaryReducer,
+    initialArgs,
+    initializer
+  );
+
+  return { dataDictionaryDispatch, dataDictionaryState };
+};

package/src/providers/dataDictionaryState/hooks/UseDataDictionaryState/hook.ts

@@ -0,0 +1,11 @@
+import { useContext } from "react";
+import { DataDictionaryStateContext } from "../../context";
+import { DataDictionaryStateContextProps } from "../../types";
+
+/**
+ * Returns data dictionary state context.
+ * @returns data dictionary state context.
+ */
+export const useDataDictionaryState = (): DataDictionaryStateContextProps => {
+  return useContext(DataDictionaryStateContext);
+};

package/src/providers/dataDictionaryState/initializer/constants.ts

@@ -0,0 +1,6 @@
+import { DataDictionaryState } from "../types";
+
+export const INITIAL_DATA_DICTIONARY_STATE: DataDictionaryState = {
+  dictionaries: {},
+  meta: null,
+};

package/src/providers/dataDictionaryState/initializer/initializer.ts

@@ -0,0 +1,22 @@
+import { UseDataDictionaryInitialArgs } from "../hooks/UseDataDictionaryInitialArgs/types";
+import { DataDictionaryState } from "../types";
+import { INITIAL_DATA_DICTIONARY_STATE } from "./constants";
+import { initDictionaries } from "./utils";
+
+/**
+ * Initializer function for the data dictionary reducer, returning initial state.
+ * @param initialArgs - Initial arguments.
+ * @param initialArgs.dataDictionaries - Data dictionary configs.
+ * @returns The initialized data dictionary state.
+ */
+export function initializer({
+  dataDictionaries,
+}: UseDataDictionaryInitialArgs): DataDictionaryState {
+  // If no data dictionary configs are provided, return default initial state.
+  if (!dataDictionaries) return INITIAL_DATA_DICTIONARY_STATE;
+
+  return {
+    dictionaries: initDictionaries(dataDictionaries),
+    meta: null,
+  };
+}

package/src/providers/dataDictionaryState/initializer/utils.ts

@@ -0,0 +1,39 @@
+import { TableState } from "@tanstack/react-table";
+import { DataDictionaryConfig } from "../../../common/entities";
+import { initPaginationState } from "../../../components/Table/coreOptions/state/pagination/utils";
+import { DictionariesContext } from "../dictionaries/types";
+
+/**
+ * Initializes the dictionaries context.
+ * @param dataDictionaries - The data dictionary configs.
+ * @returns The initialized dictionaries context.
+ */
+export function initDictionaries(
+  dataDictionaries: DataDictionaryConfig[]
+): DictionariesContext {
+  return dataDictionaries.reduce((acc, { path, tableOptions }) => {
+    acc[path] = {
+      query: { dictionary: path },
+      state: initState(tableOptions),
+    };
+    return acc;
+  }, {} as DictionariesContext);
+}
+
+/**
+ * Initializes the dictionary state (TanStack Table state).
+ * @param tableOptions - The table options.
+ * @returns The initialized dictionary state.
+ */
+function initState(
+  tableOptions: DataDictionaryConfig["tableOptions"]
+): Partial<TableState> {
+  const { initialState } = tableOptions;
+
+  return {
+    columnFilters: [],
+    globalFilter: undefined,
+    ...initialState,
+    ...initPaginationState(initialState),
+  };
+}

package/src/providers/dataDictionaryState/provider.tsx

@@ -0,0 +1,16 @@
+import React, { ReactNode } from "react";
+import { DataDictionaryStateContext } from "./context";
+import { useDataDictionaryReducer } from "./hooks/UseDataDictionaryReducer/hook";
+
+export function DataDictionaryStateProvider({
+  children,
+}: {
+  children: ReactNode | ReactNode[];
+}): JSX.Element {
+  const reducer = useDataDictionaryReducer();
+  return (
+    <DataDictionaryStateContext.Provider value={reducer}>
+      {children}
+    </DataDictionaryStateContext.Provider>
+  );
+}

package/src/providers/dataDictionaryState/reducer.ts

@@ -0,0 +1,42 @@
+import { clearMetaAction } from "./actions/clearMeta/action";
+import { stateToUrlAction } from "./actions/stateToUrl/action";
+import {
+  DataDictionaryAction,
+  DataDictionaryActionKind,
+} from "./actions/types";
+import { updateColumnFiltersAction } from "./actions/updateColumnFilters/action";
+import { updateGlobalFilterAction } from "./actions/updateGlobalFilter/action";
+import { urlToStateAction } from "./actions/urlToState/action";
+import { DataDictionaryState } from "./types";
+
+/**
+ * Reducer for data dictionary.
+ * @param state - State.
+ * @param action - Action.
+ * @returns state.
+ */
+export function dataDictionaryReducer(
+  state: DataDictionaryState,
+  action: DataDictionaryAction
+): DataDictionaryState {
+  const { payload, type } = action;
+  switch (type) {
+    case DataDictionaryActionKind.ClearMeta: {
+      return clearMetaAction(state, payload);
+    }
+    case DataDictionaryActionKind.StateToUrl: {
+      return stateToUrlAction(state, payload);
+    }
+    case DataDictionaryActionKind.UpdateColumnFilters: {
+      return updateColumnFiltersAction(state, payload);
+    }
+    case DataDictionaryActionKind.UpdateGlobalFilter: {
+      return updateGlobalFilterAction(state, payload);
+    }
+    case DataDictionaryActionKind.UrlToState: {
+      return urlToStateAction(state, payload);
+    }
+    default:
+      return state;
+  }
+}

package/src/providers/dataDictionaryState/types.ts

@@ -0,0 +1,18 @@
+import { Dispatch } from "react";
+import { META_COMMAND } from "../../hooks/stateSyncManager/hooks/UseMetaCommands/types";
+import { DataDictionaryAction } from "./actions/types";
+import { DictionariesContext } from "./dictionaries/types";
+
+export interface DataDictionaryState {
+  dictionaries: DictionariesContext;
+  meta: Meta | null;
+}
+
+export interface DataDictionaryStateContextProps {
+  dataDictionaryDispatch: Dispatch<DataDictionaryAction> | null;
+  dataDictionaryState: DataDictionaryState;
+}
+
+export interface Meta {
+  command: META_COMMAND;
+}

package/src/providers/fileManifestState/constants.ts

@@ -1,6 +1,7 @@
 import { FileManifestState } from "../fileManifestState";
 
 export const FILE_MANIFEST_STATE: FileManifestState = {
+  fileCount: undefined,
   fileSummary: undefined,
   fileSummaryFacetName: undefined,
   fileSummaryFilters: [],

package/src/providers/fileManifestState.tsx

@@ -24,6 +24,7 @@ import { FILE_MANIFEST_STATE } from "./fileManifestState/constants";
  * File manifest state.
  */
 export type FileManifestState = {
+  fileCount: number | undefined;
   filesFacets: FileFacet[];
   fileSummary?: AzulSummaryResponse;
   fileSummaryFacetName?: string;
@@ -133,6 +134,7 @@ export function FileManifestStateProvider({
 export enum FileManifestActionKind {
   ClearFileManifest = "CLEAR_FILE_MANIFEST",
   FetchFileManifest = "FETCH_FILE_MANIFEST",
+  UpdateFileCount = "UPDATE_FILE_COUNT",
   UpdateFileManifest = "UPDATE_FILE_MANIFEST",
   UpdateFilter = "UPDATE_FILTER",
   UpdateFiltersCategory = "UPDATE_FILTERS_CATEGORY",
@@ -144,6 +146,7 @@ export enum FileManifestActionKind {
 export type FileManifestAction =
   | ClearFileManifestAction
   | FetchFileManifestAction
+  | UpdateFileCountAction
   | UpdateFileManifestAction
   | UpdateFilterAction
   | UpdateFiltersCategoryAction;
@@ -172,6 +175,14 @@ type UpdateFileManifestAction = {
   type: FileManifestActionKind.UpdateFileManifest;
 };
 
+/**
+ * Update file count action.
+ */
+type UpdateFileCountAction = {
+  payload: UpdateFileCountPayload;
+  type: FileManifestActionKind.UpdateFileCount;
+};
+
 /**
  * Update filter action.
  */
@@ -196,6 +207,13 @@ type FetchFileManifestPayload = {
   filters: Filters;
 };
 
+/**
+ * Update file count payload.
+ */
+export type UpdateFileCountPayload = {
+  fileCount: number | undefined;
+};
+
 /**
  * Update file manifest payload.
  */
@@ -235,6 +253,7 @@ function fileManifestReducer(
     case FileManifestActionKind.ClearFileManifest: {
       return {
         ...state,
+        fileCount: undefined,
         isEnabled: false,
       };
     }
@@ -252,6 +271,10 @@ function fileManifestReducer(
         isEnabled: true,
       };
     }
+    // Updates file count.
+    case FileManifestActionKind.UpdateFileCount: {
+      return { ...state, ...payload };
+    }
     // Updates file manifest.
     case FileManifestActionKind.UpdateFileManifest: {
       return { ...state, ...payload };

package/src/styles/common/mui/iconButton.ts

@@ -0,0 +1,40 @@
+import { IconButtonProps } from "@mui/material";
+
+type IconButtonPropsOptions = {
+  COLOR: typeof COLOR;
+  EDGE: typeof EDGE;
+  SIZE: typeof SIZE;
+};
+
+const COLOR: Record<string, IconButtonProps["color"]> = {
+  DEFAULT: "default",
+  ERROR: "error",
+  INFO: "info",
+  INHERIT: "inherit",
+  INK: "ink",
+  INK_LIGHT: "inkLight",
+  PRIMARY: "primary",
+  SECONDARY: "secondary",
+  SUCCESS: "success",
+  WARNING: "warning",
+};
+
+const EDGE: Record<string, IconButtonProps["edge"]> = {
+  END: "end",
+  START: "start",
+};
+
+const SIZE: Record<string, IconButtonProps["size"]> = {
+  LARGE: "large",
+  MEDIUM: "medium",
+  SMALL: "small",
+  XLARGE: "xlarge",
+  XSMALL: "xsmall",
+  XXSMALL: "xxsmall",
+};
+
+export const ICON_BUTTON_PROPS: IconButtonPropsOptions = {
+  COLOR,
+  EDGE,
+  SIZE,
+};

package/src/styles/common/mui/inputAdornment.ts

@@ -0,0 +1,22 @@
+import { InputAdornmentProps } from "@mui/material";
+
+type InputAdornmentPropsOptions = {
+  POSITION: typeof POSITION;
+  VARIANT: typeof VARIANT;
+};
+
+const POSITION: Record<string, InputAdornmentProps["position"]> = {
+  END: "end",
+  START: "start",
+};
+
+const VARIANT: Record<string, InputAdornmentProps["variant"]> = {
+  FILLED: "filled",
+  OUTLINED: "outlined",
+  STANDARD: "standard",
+};
+
+export const INPUT_ADORNMENT_PROPS: InputAdornmentPropsOptions = {
+  POSITION,
+  VARIANT,
+};

package/src/styles/common/mui/outlinedInput.ts

@@ -0,0 +1,14 @@
+import { OutlinedInputProps } from "@mui/material";
+
+type OutlinedInputPropsOptions = {
+  COLOR: typeof COLOR;
+};
+
+const COLOR: Record<string, OutlinedInputProps["color"]> = {
+  PRIMARY: "primary",
+  SECONDARY: "secondary",
+};
+
+export const OUTLINED_INPUT_PROPS: OutlinedInputPropsOptions = {
+  COLOR,
+};